diff options
author | Glauber Costa <gcosta@redhat.com> | 2008-03-03 12:13:07 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:56 -0400 |
commit | 69c18c15d39c4622c6e2f97e5db4d8c9c43adaaa (patch) | |
tree | cf04add1e7b3544056eecb3b511bf4d6177120bc /include/asm-x86/smp.h | |
parent | e9a6cb96fafa4d4df2033ab6cf9c817f6f47e052 (diff) |
x86: merge __cpu_disable and cpu_die
They are now equal, and are moved to a common file
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/smp.h')
-rw-r--r-- | include/asm-x86/smp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index c800b815d378..27d9f6595232 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h | |||
@@ -70,6 +70,9 @@ void native_smp_prepare_cpus(unsigned int max_cpus); | |||
70 | void native_smp_cpus_done(unsigned int max_cpus); | 70 | void native_smp_cpus_done(unsigned int max_cpus); |
71 | int native_cpu_up(unsigned int cpunum); | 71 | int native_cpu_up(unsigned int cpunum); |
72 | 72 | ||
73 | extern int __cpu_disable(void); | ||
74 | extern void __cpu_die(unsigned int cpu); | ||
75 | |||
73 | extern unsigned disabled_cpus; | 76 | extern unsigned disabled_cpus; |
74 | extern void prefill_possible_map(void); | 77 | extern void prefill_possible_map(void); |
75 | #endif | 78 | #endif |