aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/realmode
diff options
context:
space:
mode:
authorJarkko Sakkinen <jarkko.sakkinen@intel.com>2012-05-08 14:22:41 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2012-05-08 14:48:45 -0400
commitb429dbf6e866bd6dadb56fae66f61f611cde57ff (patch)
treee01a2765f5e8847fc4229f45119ccce20de896e3 /arch/x86/realmode
parent8e029fcdd8702719c9179317cae9ef84ebe7027e (diff)
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/realmode')
-rw-r--r--arch/x86/realmode/rm/header.S1
-rw-r--r--arch/x86/realmode/rm/realmode.lds.S1
-rw-r--r--arch/x86/realmode/rmpiggy.S2
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
index a91ec8f6b15f..c83005c4d455 100644
--- a/arch/x86/realmode/rm/header.S
+++ b/arch/x86/realmode/rm/header.S
@@ -12,7 +12,6 @@
12GLOBAL(real_mode_header) 12GLOBAL(real_mode_header)
13 .long pa_text_start 13 .long pa_text_start
14 .long pa_ro_end 14 .long pa_ro_end
15 .long pa_end
16#ifdef CONFIG_X86_32 15#ifdef CONFIG_X86_32
17 .long pa_machine_real_restart_asm 16 .long pa_machine_real_restart_asm
18#endif 17#endif
diff --git a/arch/x86/realmode/rm/realmode.lds.S b/arch/x86/realmode/rm/realmode.lds.S
index 4d4afcaf5f02..86b2e8d6b1f1 100644
--- a/arch/x86/realmode/rm/realmode.lds.S
+++ b/arch/x86/realmode/rm/realmode.lds.S
@@ -65,7 +65,6 @@ SECTIONS
65 .signature : { 65 .signature : {
66 *(.signature) 66 *(.signature)
67 } 67 }
68 pa_end = .;
69 68
70 /DISCARD/ : { 69 /DISCARD/ : {
71 *(.note*) 70 *(.note*)
diff --git a/arch/x86/realmode/rmpiggy.S b/arch/x86/realmode/rmpiggy.S
index fd72a99d12ae..204c6ece0e97 100644
--- a/arch/x86/realmode/rmpiggy.S
+++ b/arch/x86/realmode/rmpiggy.S
@@ -13,6 +13,8 @@ GLOBAL(real_mode_blob)
13 .incbin "arch/x86/realmode/rm/realmode.bin" 13 .incbin "arch/x86/realmode/rm/realmode.bin"
14END(real_mode_blob) 14END(real_mode_blob)
15 15
16GLOBAL(real_mode_blob_end);
17
16GLOBAL(real_mode_relocs) 18GLOBAL(real_mode_relocs)
17 .incbin "arch/x86/realmode/rm/realmode.relocs" 19 .incbin "arch/x86/realmode/rm/realmode.relocs"
18END(real_mode_relocs) 20END(real_mode_relocs)