From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757801Ab1ILOhK (ORCPT ); Mon, 12 Sep 2011 10:37:10 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:54399 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757236Ab1ILOfA (ORCPT ); Mon, 12 Sep 2011 10:35:00 -0400 From: Matt Fleming To: linux-kernel@vger.kernel.org Cc: "H. Peter Anvin" , Matthew Garrett , x86@kernel.org, Ingo Molnar , Thomas Gleixner , Matt Fleming Subject: [PATCH 01/10] x86: Add missing bzImage fields to struct setup_header Date: Mon, 12 Sep 2011 15:34:45 +0100 Message-Id: <1315838094-2307-2-git-send-email-matt@console-pimps.org> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1315838094-2307-1-git-send-email-matt@console-pimps.org> References: <1315838094-2307-1-git-send-email-matt@console-pimps.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matt Fleming 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. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Signed-off-by: Matt Fleming --- 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 { -- 1.7.4.4