diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-03 18:13:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:40:57 +0200 |
| commit | 91718e8d13c23bfe0aa6fa6b730c5c33ee9771bf (patch) | |
| tree | 6ed8d645bfdc0bdcf6b93e3ac9b618f879b3bf8b /include/asm-x86/smp.h | |
| parent | x86: adapt voyager's setup_trampoline (diff) | |
| download | linux-91718e8d13c23bfe0aa6fa6b730c5c33ee9771bf.tar.xz linux-91718e8d13c23bfe0aa6fa6b730c5c33ee9771bf.zip | |
x86: unify setup_trampoline
setup_trampoline() looks very similar between architectures, and this
patch unifies them. The i386 version allocates bootmem memory, while
the x86_64 version uses a fixed address.
In this patch, we initialize the global trampoline_base to the x86_64 version,
and i386 allocation can later override it.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/smp.h')
| -rw-r--r-- | include/asm-x86/smp.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index b2a1697e4700..513c8571a4a0 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h @@ -14,6 +14,7 @@ extern unsigned int num_processors; */ extern const unsigned char trampoline_data []; extern const unsigned char trampoline_end []; +extern unsigned char *trampoline_base; struct smp_ops { void (*smp_prepare_boot_cpu)(void); @@ -81,6 +82,9 @@ extern void __cpu_die(unsigned int cpu); extern unsigned disabled_cpus; extern void prefill_possible_map(void); + +#define SMP_TRAMPOLINE_BASE 0x6000 +extern unsigned long setup_trampoline(void); #endif #ifdef CONFIG_X86_32 |