Skip to content

Commit

Permalink
x86: Add missing bzImage fields to struct setup_header
Browse files Browse the repository at this point in the history
commit 37ba7ab ("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>
  • Loading branch information
Matt Fleming authored and H. Peter Anvin committed Dec 10, 2011
1 parent 6d3e32e commit 8af21e7
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/x86/include/asm/bootparam.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 8af21e7

Please sign in to comment.