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>
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 40c91bb..6d2df8d 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -224,10 +224,8 @@
 
 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 #####################################################