aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/smp_64.h
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-03 12:13:07 -0500
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:40:56 -0400
commit69c18c15d39c4622c6e2f97e5db4d8c9c43adaaa (patch)
treecf04add1e7b3544056eecb3b511bf4d6177120bc /include/asm-x86/smp_64.h
parente9a6cb96fafa4d4df2033ab6cf9c817f6f47e052 (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_64.h')
-rw-r--r--include/asm-x86/smp_64.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
index 1ecf8134bdc9..d554d7d57327 100644
--- a/include/asm-x86/smp_64.h
+++ b/include/asm-x86/smp_64.h
@@ -42,9 +42,6 @@ static inline int cpu_present_to_apicid(int mps_cpu)
42 42
43#define SMP_TRAMPOLINE_BASE 0x6000 43#define SMP_TRAMPOLINE_BASE 0x6000
44 44
45extern int __cpu_disable(void);
46extern void __cpu_die(unsigned int cpu);
47
48#define raw_smp_processor_id() read_pda(cpunumber) 45#define raw_smp_processor_id() read_pda(cpunumber)
49#define cpu_physical_id(cpu) per_cpu(x86_cpu_to_apicid, cpu) 46#define cpu_physical_id(cpu) per_cpu(x86_cpu_to_apicid, cpu)
50 47