| Message ID | 1355467767-29575-13-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | Tom Rini |
| Headers | show |
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 <sjg@chromium.org> > --- > 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
Hi Graeme, On Fri, Dec 14, 2012 at 2:32 PM, Graeme Russ <graeme.russ@gmail.com> wrote: > 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 <sjg@chromium.org> >> --- >> 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 I build tested each commit, but did not run-test each unfortunately. Yes I agree it would be annoying to break this even within a series, unless it is unavoidable. I will retest, assuming the basic concept passes muster. Regards, Simon > > Regards, > > Graeme >
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;
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: None arch/x86/include/asm/global_data.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)