diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2011-08-27 09:35:45 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-12-09 17:35:33 -0800 |
| commit | 8af21e7e71d1ac56d9b66fb787a14fd66af7f5f7 (patch) | |
| tree | 9a6a6b2b80cce565a69760aa48b5497fc5b97b27 /arch | |
| parent | 6d3e32e63f1fb47b3ba104d13dfac116df7b2bbb (diff) | |
| download | op-kernel-dev-8af21e7e71d1ac56d9b66fb787a14fd66af7f5f7.zip op-kernel-dev-8af21e7e71d1ac56d9b66fb787a14fd66af7f5f7.tar.gz | |
x86: Add missing bzImage fields to struct setup_header
commit 37ba7ab5e33c ("x86, boot: make kernel_alignment adjustable; new
bzImage fields") introduced some new fields into the bzImage header
but struct setup_header was not updated accordingly. Add the missing
'pref_address' and 'init_size' fields.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1318848017-12301-1-git-send-email-matt@console-pimps.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/bootparam.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h index e020d88..2f90c51 100644 --- a/arch/x86/include/asm/bootparam.h +++ b/arch/x86/include/asm/bootparam.h @@ -64,6 +64,8 @@ struct setup_header { __u32 payload_offset; __u32 payload_length; __u64 setup_data; + __u64 pref_address; + __u32 init_size; } __attribute__((packed)); struct sys_desc_table { |
