projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6d3e32e)
x86: Add missing bzImage fields to struct setup_header
authorMatt Fleming <matt.fleming@intel.com>
Sat, 27 Aug 2011 08:35:45 +0000 (09:35 +0100)
committerH. Peter Anvin <hpa@linux.intel.com>
Sat, 10 Dec 2011 01:35:33 +0000 (17:35 -0800)
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>
arch/x86/include/asm/bootparam.h patch | blob | blame | history

diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h
index e020d88ec02dc2636800eee7203cf4a800dc2fb3..2f90c51cc49d740ed849cfc8775b3478fd6987f5 100644 (file)
--- 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 {