From mboxrd@z Thu Jan 1 00:00:00 1970 From: Graeme Russ Date: Sat, 15 Dec 2012 09:32:01 +1100 Subject: [U-Boot] [PATCH v2 12/58] x86: Move gd_addr into arch_global_data In-Reply-To: <1355467767-29575-13-git-send-email-sjg@chromium.org> References: <1355467767-29575-1-git-send-email-sjg@chromium.org> <1355467767-29575-13-git-send-email-sjg@chromium.org> Message-ID: <50CBA8E1.40104@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Simon, On 14/12/12 17:48, Simon Glass wrote: > Move this field into arch_global_data and tidy up. > > Signed-off-by: Simon Glass > --- > Changes in v2: None > > arch/x86/include/asm/global_data.h | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h > index 9a4f141..eded279 100644 > --- a/arch/x86/include/asm/global_data.h > +++ b/arch/x86/include/asm/global_data.h > @@ -28,6 +28,7 @@ > > /* Architecture-specific global data */ > struct arch_global_data { > + struct global_data *gd_addr; /* Location of Global Data */ > }; > > /* > @@ -44,8 +45,6 @@ typedef struct global_data gd_t; > > struct global_data { > struct arch_global_data arch; /* architecture-specific data */ > - /* NOTE: gd_addr MUST be first member of struct global_data! */ > - gd_t *gd_addr; /* Location of Global Data */ > bd_t *bd; > unsigned long flags; > unsigned int baudrate; > NAK - You've broken bisectability - patch 13 (slightly modified) needs to come first Regards, Graeme