diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-03 14:13:12 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:40:57 +0200 |
| commit | 91718e8d13c23bfe0aa6fa6b730c5c33ee9771bf (patch) | |
| tree | 6ed8d645bfdc0bdcf6b93e3ac9b618f879b3bf8b /arch/x86/kernel/smpboot_64.c | |
| parent | da522b07293756b9cb4e2c570454f95b8e79e189 (diff) | |
| download | op-kernel-dev-91718e8d13c23bfe0aa6fa6b730c5c33ee9771bf.zip op-kernel-dev-91718e8d13c23bfe0aa6fa6b730c5c33ee9771bf.tar.gz | |
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 'arch/x86/kernel/smpboot_64.c')
| -rw-r--r-- | arch/x86/kernel/smpboot_64.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index 2cc1b8b..9f4935e 100644 --- a/arch/x86/kernel/smpboot_64.c +++ b/arch/x86/kernel/smpboot_64.c @@ -85,20 +85,6 @@ struct task_struct *idle_thread_array[NR_CPUS] __cpuinitdata ; #define set_idle_for_cpu(x,p) (idle_thread_array[(x)] = (p)) #endif - -/* - * Currently trivial. Write the real->protected mode - * bootstrap into the page concerned. The caller - * has made sure it's suitably aligned. - */ - -static unsigned long __cpuinit setup_trampoline(void) -{ - void *tramp = __va(SMP_TRAMPOLINE_BASE); - memcpy(tramp, trampoline_data, trampoline_end - trampoline_data); - return virt_to_phys(tramp); -} - /* * The bootstrap kernel entry code has set these up. Save them for * a given CPU |
