[PATCH v2 1/6] kexec, x86: add boot header member for version 2.12

Yinghai Lu
2012-11-19T03:04:44Z

will use ext_ramdisk_image/size, and code64_start_offset

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
include/x86/x86-linux.h | 22 +++++++++++++++++++++-
kexec/arch/i386/x86-linux-setup.c | 2 +-
2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/include/x86/x86-linux.h b/include/x86/x86-linux.h
index 27af02b..71cd296 100644
--- a/include/x86/x86-linux.h
+++ b/include/x86/x86-linux.h
@@ -178,7 +178,17 @@ struct x86_linux_param_header {
uint32_t cmdline_size; /* 0x238 */
uint32_t hardware_subarch; /* 0x23C */
uint64_t hardware_subarch_data; /* 0x240 */
- uint8_t reserved16[0x290 - 0x248]; /* 0x248 */
+ uint32_t payload_offset; /* 0x248 */
+ uint32_t payload_length; /* 0x24C */
+ uint64_t setup_data; /* 0x250 */
+ uint64_t pref_address; /* 0x258 */
+ uint32_t init_size; /* 0x260 */
+ uint32_t handover_offset; /* 0x264 */
+ uint32_t ext_ramdisk_image; /* 0x268 */
+ uint32_t ext_ramdisk_size; /* 0x26C */
+ uint32_t code64_start_offset; /* 0x270 */
+ uint32_t ext_cmd_line_ptr; /* 0x274 */
+ uint8_t reserved16[0x290 - 0x278]; /* 0x278 */
uint32_t edd_mbr_sig_buffer[EDD_MBR_SIG_MAX]; /* 0x290 */
#endif
struct e820entry e820_map[E820MAX]; /* 0x2d0 */
@@ -245,6 +255,16 @@ struct x86_linux_header {
uint32_t cmdline_size; /* 0x238 */
uint32_t hardware_subarch; /* 0x23C */
uint64_t hardware_subarch_data; /* 0x240 */
+ uint32_t payload_offset; /* 0x248 */
+ uint32_t payload_length; /* 0x24C */
+ uint64_t setup_data; /* 0x250 */
+ uint64_t pref_address; /* 0x258 */
+ uint32_t init_size; /* 0x260 */
+ uint32_t handover_offset; /* 0x264 */
+ uint32_t ext_ramdisk_image; /* 0x268 */
+ uint32_t ext_ramdisk_size; /* 0x26C */
+ uint32_t code64_start_offset; /* 0x270 */
+ uint32_t ext_cmd_line_ptr; /* 0x274 */
#endif
} PACKED;

diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c
index b7ab8ea..53d9df9 100644
--- a/kexec/arch/i386/x86-linux-setup.c
+++ b/kexec/arch/i386/x86-linux-setup.c
@@ -41,7 +41,7 @@ void init_linux_parameters(struct x86_linux_param_header *real_mode)

/* Boot block magic */
memcpy(real_mode->header_magic, "HdrS", 4);
- real_mode->protocol_version = 0x0206;
+ real_mode->protocol_version = 0x020C;
real_mode->initrd_addr_max = DEFAULT_INITRD_ADDR_MAX;
real_mode->cmdline_size = COMMAND_LINE_SIZE;
}
--
1.7.7