diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-03 14:13:09 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:40:56 +0200 |
| commit | 420688293927a590d092ec76ef97c2565ae21aff (patch) | |
| tree | 03dfb10406094bb146cebe487cb9c2c7232feee8 | |
| parent | 89b08200ad8bc8fb860da218c4f3bcc292bf286c (diff) | |
| download | linux-420688293927a590d092ec76ef97c2565ae21aff.tar.gz linux-420688293927a590d092ec76ef97c2565ae21aff.tar.bz2 linux-420688293927a590d092ec76ef97c2565ae21aff.zip | |
x86: move trampoline arrays extern definition to smp.h
In here, they can serve both architectures
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/smpboot_32.c | 6 | ||||
| -rw-r--r-- | arch/x86/kernel/smpboot_64.c | 7 | ||||
| -rw-r--r-- | include/asm-x86/smp.h | 6 |
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); 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 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 @@ /* Set when the idlers are all forked */ 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 */ DEFINE_PER_CPU(int, cpu_state) = { 0 }; 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; extern int smp_num_siblings; 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 { void (*smp_prepare_boot_cpu)(void); void (*smp_prepare_cpus)(unsigned max_cpus); |