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_32.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_32.h')
-rw-r--r-- | include/asm-x86/smp_32.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h index 0b2513468870..4fec2feb6ac8 100644 --- a/include/asm-x86/smp_32.h +++ b/include/asm-x86/smp_32.h | |||
@@ -34,9 +34,6 @@ DECLARE_PER_CPU(u16, x86_cpu_to_apicid); | |||
34 | #define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0) | 34 | #define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0) |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | extern int __cpu_disable(void); | ||
38 | extern void __cpu_die(unsigned int cpu); | ||
39 | |||
40 | /* | 37 | /* |
41 | * This function is needed by all SMP systems. It must _always_ be valid | 38 | * This function is needed by all SMP systems. It must _always_ be valid |
42 | * from the initial startup. We map APIC_BASE very early in page_setup(), | 39 | * from the initial startup. We map APIC_BASE very early in page_setup(), |