diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@intel.com> | 2012-05-08 21:22:40 +0300 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-08 11:48:11 -0700 |
| commit | 8e029fcdd8702719c9179317cae9ef84ebe7027e (patch) | |
| tree | 12140b7331764ff0e0cd4e0d7bd290453d51110f /arch/x86/realmode/rmpiggy.S | |
| parent | 6feb592dceaed1a6cf26c9747b1180958d5156cd (diff) | |
x86, realmode: fix 64-bit wakeup sequence
There were number of issues in wakeup sequence:
- Wakeup stack was placed in hardcoded address.
- NX bit in EFER was not enabled.
- Initialization incorrectly set physical address
of secondary_startup_64.
- Some alignment issues.
This patch fixes these issues and in addition:
- Unifies coding conventions in .S files.
- Sets alignments of code and data right.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Link: http://lkml.kernel.org/r/1336501366-28617-18-git-send-email-jarkko.sakkinen@intel.com
Originally-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Len Brown <len.brown@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/realmode/rmpiggy.S')
| -rw-r--r-- | arch/x86/realmode/rmpiggy.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/realmode/rmpiggy.S b/arch/x86/realmode/rmpiggy.S index 6047d7f604c..fd72a99d12a 100644 --- a/arch/x86/realmode/rmpiggy.S +++ b/arch/x86/realmode/rmpiggy.S @@ -9,10 +9,10 @@ .balign PAGE_SIZE -ENTRY(real_mode_blob) +GLOBAL(real_mode_blob) .incbin "arch/x86/realmode/rm/realmode.bin" END(real_mode_blob) -ENTRY(real_mode_relocs) +GLOBAL(real_mode_relocs) .incbin "arch/x86/realmode/rm/realmode.relocs" END(real_mode_relocs) |