]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86: move disabled_cpus to common header
authorGlauber Costa <gcosta@redhat.com>
Mon, 3 Mar 2008 17:12:40 +0000 (14:12 -0300)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Apr 2008 15:40:53 +0000 (17:40 +0200)
disabled_cpus is (up to now) a x86_64-only contruction.
But it's extern declaration can be moved to common header anyway

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/asm-x86/smp.h
include/asm-x86/smp_64.h

index 9620165d3b78d3c12f864d193cd6dc6445399d20..be8a511fdb1da325b52e092cc34a24b04e3c57db 100644 (file)
@@ -2,6 +2,7 @@
 #define _ASM_X86_SMP_H_
 #ifndef __ASSEMBLY__
 #include <linux/cpumask.h>
+#include <linux/init.h>
 
 extern cpumask_t cpu_callout_map;
 
@@ -60,6 +61,8 @@ void native_smp_prepare_boot_cpu(void);
 void native_smp_prepare_cpus(unsigned int max_cpus);
 void native_smp_cpus_done(unsigned int max_cpus);
 int native_cpu_up(unsigned int cpunum);
+
+extern unsigned disabled_cpus;
 #endif
 
 #ifdef CONFIG_X86_32
index b9204584aa064ecee1161379a34bffc6a4853b5f..c7a00caa6ec6e91b0cf094fff0777f7600e3749a 100644 (file)
@@ -44,7 +44,6 @@ static inline int cpu_present_to_apicid(int mps_cpu)
 extern int __cpu_disable(void);
 extern void __cpu_die(unsigned int cpu);
 extern void prefill_possible_map(void);
-extern unsigned __cpuinitdata disabled_cpus;
 
 #define raw_smp_processor_id() read_pda(cpunumber)
 #define cpu_physical_id(cpu)   per_cpu(x86_cpu_to_apicid, cpu)