From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 28 Jan 2009 22:12:55 +0000 (+0100)
Subject: Merge branch 'core/percpu' into x86/core
X-Git-Tag: v2.6.31-rc1~383^2~508^2~167
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6a385db5ce7f1fd2c68ec511e44587b67dab8fca;p=linux.git

Merge branch 'core/percpu' into x86/core

Conflicts:
	kernel/irq/handle.c
---

6a385db5ce7f1fd2c68ec511e44587b67dab8fca
diff --cc kernel/irq/handle.c
index 3aba8d12f328,375d68cd5bf0..f51eaee921b6
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@@ -146,8 -133,10 +145,12 @@@ int __init early_irq_init(void
  	int legacy_count;
  	int i;
  
 +	init_irq_default_affinity();
 +
+ 	 /* initialize nr_irqs based on nr_cpu_ids */
+ 	arch_probe_nr_irqs();
+ 	printk(KERN_INFO "NR_IRQS:%d nr_irqs:%d\n", NR_IRQS, nr_irqs);
+ 
  	desc = irq_desc_legacy;
  	legacy_count = ARRAY_SIZE(irq_desc_legacy);
  
@@@ -233,8 -229,8 +243,10 @@@ int __init early_irq_init(void
  	int count;
  	int i;
  
 +	init_irq_default_affinity();
 +
+ 	printk(KERN_INFO "NR_IRQS:%d\n", NR_IRQS);
+ 
  	desc = irq_desc;
  	count = ARRAY_SIZE(irq_desc);