aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
authorJarkko Sakkinen <jarkko.sakkinen@intel.com>2012-05-08 14:22:43 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2012-05-08 14:48:45 -0400
commitf37240f16bec91f15ce564515f70a6ca9715ce96 (patch)
treed1e98241650bfed0d87f60e3e71a8ad716782f6d /arch/x86/kernel/smpboot.c
parentc4845474a01f699966272536e8416222e3f2d2cb (diff)
x86, realmode: header for trampoline code
Added header for trampoline code that can be used to supply input data to it. This makes interface between real mode code and kernel cleaner and simpler. Replaced two confusing pointers to level4 pgt in trampoline_64.S with a single pointer to the beginning of the page table. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com> Link: http://lkml.kernel.org/r/1336501366-28617-21-git-send-email-jarkko.sakkinen@intel.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r--arch/x86/kernel/smpboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index b8c0661e2341..757c4b1d0a02 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -667,7 +667,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
667 volatile u32 *trampoline_status = 667 volatile u32 *trampoline_status =
668 (volatile u32 *) __va(real_mode_header->trampoline_status); 668 (volatile u32 *) __va(real_mode_header->trampoline_status);
669 /* start_ip had better be page-aligned! */ 669 /* start_ip had better be page-aligned! */
670 unsigned long start_ip = real_mode_header->trampoline_data; 670 unsigned long start_ip = real_mode_header->trampoline_start;
671 671
672 unsigned long boot_error = 0; 672 unsigned long boot_error = 0;
673 int timeout; 673 int timeout;