| Message ID | 1297292893-30241-2-git-send-email-shaggy@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Rejected, archived |
| Headers | show |
On Wed, Feb 09, 2011 at 05:08:08PM -0600, Dave Kleikamp wrote: >so that it can use information from the device tree. > >Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com> >Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> >Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com> >Cc: linuxppc-dev@lists.ozlabs.org >--- Ben, you want this patch dropped, right? josh > arch/powerpc/kernel/setup_32.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > >diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c >index 1d2fbc9..d1ca976 100644 >--- a/arch/powerpc/kernel/setup_32.c >+++ b/arch/powerpc/kernel/setup_32.c >@@ -120,12 +120,12 @@ notrace void __init machine_init(unsigned long dt_ptr) > { > lockdep_init(); > >- /* Enable early debugging if any specified (see udbg.h) */ >- udbg_early_init(); >- > /* Do some early initialization based on the flat device tree */ > early_init_devtree(__va(dt_ptr)); > >+ /* Enable early debugging if any specified (see udbg.h) */ >+ udbg_early_init(); >+ > probe_machine(); > > setup_kdump_trampoline(); >-- >1.7.3.4 >
On Tue, 2011-03-15 at 09:05 -0400, Josh Boyer wrote: > On Wed, Feb 09, 2011 at 05:08:08PM -0600, Dave Kleikamp wrote: > >so that it can use information from the device tree. > > > >Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com> > >Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > >Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com> > >Cc: linuxppc-dev@lists.ozlabs.org > >--- > > Ben, you want this patch dropped, right? Yes ! Cheers, Ben. > josh > > > arch/powerpc/kernel/setup_32.c | 6 +++--- > > 1 files changed, 3 insertions(+), 3 deletions(-) > > > >diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c > >index 1d2fbc9..d1ca976 100644 > >--- a/arch/powerpc/kernel/setup_32.c > >+++ b/arch/powerpc/kernel/setup_32.c > >@@ -120,12 +120,12 @@ notrace void __init machine_init(unsigned long dt_ptr) > > { > > lockdep_init(); > > > >- /* Enable early debugging if any specified (see udbg.h) */ > >- udbg_early_init(); > >- > > /* Do some early initialization based on the flat device tree */ > > early_init_devtree(__va(dt_ptr)); > > > >+ /* Enable early debugging if any specified (see udbg.h) */ > >+ udbg_early_init(); > >+ > > probe_machine(); > > > > setup_kdump_trampoline(); > >-- > >1.7.3.4 > >
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 1d2fbc9..d1ca976 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -120,12 +120,12 @@ notrace void __init machine_init(unsigned long dt_ptr) { lockdep_init(); - /* Enable early debugging if any specified (see udbg.h) */ - udbg_early_init(); - /* Do some early initialization based on the flat device tree */ early_init_devtree(__va(dt_ptr)); + /* Enable early debugging if any specified (see udbg.h) */ + udbg_early_init(); + probe_machine(); setup_kdump_trampoline();
so that it can use information from the device tree. Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com> Cc: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/kernel/setup_32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)