summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/header.S
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-05-11 23:21:12 +0200
committerH. Peter Anvin <hpa@zytor.com>2009-05-11 23:40:50 +0200
commit77d1a4999502c260df0eb2de437d320bf8c64b36 (patch)
treed479843ccd9ffdd0e89548753c391950adb664a4 /arch/x86/boot/header.S
parentx86, boot: determine compressed code offset at compile time (diff)
downloadlinux-77d1a4999502c260df0eb2de437d320bf8c64b36.tar.xz
linux-77d1a4999502c260df0eb2de437d320bf8c64b36.zip
x86, boot: make symbols from the main vmlinux available
Make symbols from the main vmlinux, as opposed to just compressed/vmlinux, available to header.S. Also, export a few additional symbols. This will be used in a subsequent patch to export the total memory footprint of the kernel. [ Impact: enable future enhancement ] Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot/header.S')
-rw-r--r--arch/x86/boot/header.S7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 5d84d1c74e4c..27285143adeb 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -22,7 +22,8 @@
#include <asm/page_types.h>
#include <asm/setup.h>
#include "boot.h"
-#include "offsets.h"
+#include "voffset.h"
+#include "zoffset.h"
BOOTSEG = 0x07C0 /* original address of boot-sector */
SYSSEG = 0x1000 /* historical load address >> 4 */
@@ -212,8 +213,8 @@ hardware_subarch: .long 0 # subarchitecture, added with 2.07
hardware_subarch_data: .quad 0
-payload_offset: .long input_data
-payload_length: .long input_data_end-input_data
+payload_offset: .long ZO_input_data
+payload_length: .long ZO_z_input_len
setup_data: .quad 0 # 64-bit physical pointer to
# single linked list of