Messages in this thread Patch in this message | | | Date | Fri, 9 Dec 2011 18:37:24 -0800 | From | tip-bot for Matt Fleming <> | Subject | [tip:x86/efi] x86: Add missing bzImage fields to struct setup_header |
| |
Commit-ID: 8af21e7e71d1ac56d9b66fb787a14fd66af7f5f7 Gitweb: http://git.kernel.org/tip/8af21e7e71d1ac56d9b66fb787a14fd66af7f5f7 Author: Matt Fleming <matt.fleming@intel.com> AuthorDate: Sat, 27 Aug 2011 09:35:45 +0100 Committer: H. Peter Anvin <hpa@linux.intel.com> CommitDate: Fri, 9 Dec 2011 17:35:33 -0800
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> --- 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 {
| |