summaryrefslogtreecommitdiff
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorIan Campbell <ijc@hellion.org.uk>2008-02-19 11:12:30 +0000
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:40:48 +0200
commit87253d1b4f2b5a29bdfc6275b9fb52a47d72df64 (patch)
treec2381c07282c356a3e64828b6d0a75e275938d44 /arch/x86/boot
parentbc0a733facbbde6c464e3ba5e165607fe4824cca (diff)
downloadlinux-3.10-87253d1b4f2b5a29bdfc6275b9fb52a47d72df64.tar.gz
linux-3.10-87253d1b4f2b5a29bdfc6275b9fb52a47d72df64.tar.bz2
linux-3.10-87253d1b4f2b5a29bdfc6275b9fb52a47d72df64.zip
x86: boot protocol updates
Also update field names to simply payload_{offset,length} so as to not rule out uncompressed images. Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Cc: virtualization@lists.linux-foundation.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/header.S6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 40c91bb483e..6d2df8d61c5 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -224,10 +224,8 @@ hardware_subarch: .long 0 # subarchitecture, added with 2.07
hardware_subarch_data: .quad 0
-compressed_payload_offset:
- .long input_data
-compressed_payload_length:
- .long input_data_end-input_data
+payload_offset: .long input_data
+payload_length: .long input_data_end-input_data
# End of setup header #####################################################