Commit 42068829 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar

x86: move trampoline arrays extern definition to smp.h

In here, they can serve both architectures
Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 89b08200
...@@ -73,12 +73,6 @@ EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid); ...@@ -73,12 +73,6 @@ EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);
u8 apicid_2_node[MAX_APICID]; u8 apicid_2_node[MAX_APICID];
/*
* Trampoline 80x86 program as an array.
*/
extern const unsigned char trampoline_data [];
extern const unsigned char trampoline_end [];
static unsigned char *trampoline_base; static unsigned char *trampoline_base;
static void map_cpu_to_logical_apicid(void); static void map_cpu_to_logical_apicid(void);
......
...@@ -63,13 +63,6 @@ ...@@ -63,13 +63,6 @@
/* Set when the idlers are all forked */ /* Set when the idlers are all forked */
int smp_threads_ready; int smp_threads_ready;
/*
* Trampoline 80x86 program as an array.
*/
extern const unsigned char trampoline_data[];
extern const unsigned char trampoline_end[];
/* State of each CPU */ /* State of each CPU */
DEFINE_PER_CPU(int, cpu_state) = { 0 }; DEFINE_PER_CPU(int, cpu_state) = { 0 };
......
...@@ -9,6 +9,12 @@ extern cpumask_t cpu_callout_map; ...@@ -9,6 +9,12 @@ extern cpumask_t cpu_callout_map;
extern int smp_num_siblings; extern int smp_num_siblings;
extern unsigned int num_processors; extern unsigned int num_processors;
/*
* Trampoline 80x86 program as an array.
*/
extern const unsigned char trampoline_data [];
extern const unsigned char trampoline_end [];
struct smp_ops { struct smp_ops {
void (*smp_prepare_boot_cpu)(void); void (*smp_prepare_boot_cpu)(void);
void (*smp_prepare_cpus)(unsigned max_cpus); void (*smp_prepare_cpus)(unsigned max_cpus);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment