summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
authorJarkko Sakkinen <jarkko.sakkinen@intel.com>2012-05-08 20:22:41 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2012-05-08 20:48:45 +0200
commitb429dbf6e866bd6dadb56fae66f61f611cde57ff (patch)
treee01a2765f5e8847fc4229f45119ccce20de896e3 /arch/x86/kernel/smpboot.c
parentx86, realmode: fix 64-bit wakeup sequence (diff)
downloadlinux-b429dbf6e866bd6dadb56fae66f61f611cde57ff.tar.xz
linux-b429dbf6e866bd6dadb56fae66f61f611cde57ff.zip
x86, realmode: don't copy real_mode_header
Replaced copying of real_mode_header with a pointer to beginning of RM memory. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com> Link: http://lkml.kernel.org/r/1336501366-28617-19-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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index c7971ea74bd0..b8c0661e2341 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -665,9 +665,9 @@ static void __cpuinit announce_cpu(int cpu, int apicid)
static int __cpuinit do_boot_cpu(int apicid, int cpu)
{
volatile u32 *trampoline_status =
- (volatile u32 *) __va(real_mode_header.trampoline_status);
+ (volatile u32 *) __va(real_mode_header->trampoline_status);
/* start_ip had better be page-aligned! */
- unsigned long start_ip = real_mode_header.trampoline_data;
+ unsigned long start_ip = real_mode_header->trampoline_data;
unsigned long boot_error = 0;
int timeout;