summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-03-19 14:25:05 -0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:00 +0200
commit1d89a7f072d4f76f0538edfb474d527066ee7838 (patch)
tree8d9ae2788f90923a3c31c5fc6b8400b2387c416a /include
parentf7401f7fe653f90f8f80a241840b9b499779e87d (diff)
downloadblackbird-op-linux-1d89a7f072d4f76f0538edfb474d527066ee7838.tar.gz
blackbird-op-linux-1d89a7f072d4f76f0538edfb474d527066ee7838.zip
x86: merge smp_store_cpu_info
now that it is the same between arches, put it into smpboot.c Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/smp.h2
-rw-r--r--include/asm-x86/smp_32.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 4dc271b43767..b4c5143d7f8d 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -88,6 +88,8 @@ extern void prefill_possible_map(void);
#define SMP_TRAMPOLINE_BASE 0x6000
extern unsigned long setup_trampoline(void);
+
+void smp_store_cpu_info(int id);
#endif
#ifdef CONFIG_X86_32
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 76740def6092..51624abda43a 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -42,8 +42,6 @@ DECLARE_PER_CPU(int, cpu_number);
extern int safe_smp_processor_id(void);
-void __cpuinit smp_store_cpu_info(int id);
-
/* We don't mark CPUs online until __cpu_up(), so we need another measure */
static inline int num_booting_cpus(void)
{
OpenPOWER on IntegriCloud