diff options
| -rw-r--r-- | include/asm-x86/smp.h | 3 | ||||
| -rw-r--r-- | include/asm-x86/smp_64.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index 9620165d3b78..be8a511fdb1d 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #define _ASM_X86_SMP_H_ | 2 | #define _ASM_X86_SMP_H_ |
| 3 | #ifndef __ASSEMBLY__ | 3 | #ifndef __ASSEMBLY__ |
| 4 | #include <linux/cpumask.h> | 4 | #include <linux/cpumask.h> |
| 5 | #include <linux/init.h> | ||
| 5 | 6 | ||
| 6 | extern cpumask_t cpu_callout_map; | 7 | extern cpumask_t cpu_callout_map; |
| 7 | 8 | ||
| @@ -60,6 +61,8 @@ void native_smp_prepare_boot_cpu(void); | |||
| 60 | void native_smp_prepare_cpus(unsigned int max_cpus); | 61 | void native_smp_prepare_cpus(unsigned int max_cpus); |
| 61 | void native_smp_cpus_done(unsigned int max_cpus); | 62 | void native_smp_cpus_done(unsigned int max_cpus); |
| 62 | int native_cpu_up(unsigned int cpunum); | 63 | int native_cpu_up(unsigned int cpunum); |
| 64 | |||
| 65 | extern unsigned disabled_cpus; | ||
| 63 | #endif | 66 | #endif |
| 64 | 67 | ||
| 65 | #ifdef CONFIG_X86_32 | 68 | #ifdef CONFIG_X86_32 |
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h index b9204584aa06..c7a00caa6ec6 100644 --- a/include/asm-x86/smp_64.h +++ b/include/asm-x86/smp_64.h | |||
| @@ -44,7 +44,6 @@ static inline int cpu_present_to_apicid(int mps_cpu) | |||
| 44 | extern int __cpu_disable(void); | 44 | extern int __cpu_disable(void); |
| 45 | extern void __cpu_die(unsigned int cpu); | 45 | extern void __cpu_die(unsigned int cpu); |
| 46 | extern void prefill_possible_map(void); | 46 | extern void prefill_possible_map(void); |
| 47 | extern unsigned __cpuinitdata disabled_cpus; | ||
| 48 | 47 | ||
| 49 | #define raw_smp_processor_id() read_pda(cpunumber) | 48 | #define raw_smp_processor_id() read_pda(cpunumber) |
| 50 | #define cpu_physical_id(cpu) per_cpu(x86_cpu_to_apicid, cpu) | 49 | #define cpu_physical_id(cpu) per_cpu(x86_cpu_to_apicid, cpu) |
