aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/smpboot_32.c6
-rw-r--r--arch/x86/kernel/smpboot_64.c7
-rw-r--r--include/asm-x86/smp.h6
3 files changed, 6 insertions, 13 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index 3236e843a9ad..a21f25418b3e 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -73,12 +73,6 @@ EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);
73 73
74u8 apicid_2_node[MAX_APICID]; 74u8 apicid_2_node[MAX_APICID];
75 75
76/*
77 * Trampoline 80x86 program as an array.
78 */
79
80extern const unsigned char trampoline_data [];
81extern const unsigned char trampoline_end [];
82static unsigned char *trampoline_base; 76static unsigned char *trampoline_base;
83 77
84static void map_cpu_to_logical_apicid(void); 78static void map_cpu_to_logical_apicid(void);
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 0c67e5ae9c9d..2cc1b8b0601c 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -63,13 +63,6 @@
63/* Set when the idlers are all forked */ 63/* Set when the idlers are all forked */
64int smp_threads_ready; 64int smp_threads_ready;
65 65
66/*
67 * Trampoline 80x86 program as an array.
68 */
69
70extern const unsigned char trampoline_data[];
71extern const unsigned char trampoline_end[];
72
73/* State of each CPU */ 66/* State of each CPU */
74DEFINE_PER_CPU(int, cpu_state) = { 0 }; 67DEFINE_PER_CPU(int, cpu_state) = { 0 };
75 68
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 27d9f6595232..b2a1697e4700 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -9,6 +9,12 @@ extern cpumask_t cpu_callout_map;
9extern int smp_num_siblings; 9extern int smp_num_siblings;
10extern unsigned int num_processors; 10extern unsigned int num_processors;
11 11
12/*
13 * Trampoline 80x86 program as an array.
14 */
15extern const unsigned char trampoline_data [];
16extern const unsigned char trampoline_end [];
17
12struct smp_ops { 18struct smp_ops {
13 void (*smp_prepare_boot_cpu)(void); 19 void (*smp_prepare_boot_cpu)(void);
14 void (*smp_prepare_cpus)(unsigned max_cpus); 20 void (*smp_prepare_cpus)(unsigned max_cpus);