diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2005-09-23 00:50:25 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-23 00:50:25 -0400 |
commit | 7c6f947f2477f7c0017be1af458eb5e0b96b7f40 (patch) | |
tree | abb7a4387a8b1ab531fa1746ddd88f9215bc8449 | |
parent | 4c55130b2aa93370f1bf52d2304394e91cf8ee39 (diff) |
ppc64 iSeries: Make stab_initialize() work on iSeries
We don't need to call stab_initialize() for the boot cpu on iSeries, so
we hack around it so that early_setup() can be called on iSeries.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | arch/ppc64/kernel/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index 5ac48bd64891..ca8acf671e46 100644 --- a/arch/ppc64/kernel/setup.c +++ b/arch/ppc64/kernel/setup.c | |||
@@ -58,6 +58,7 @@ | |||
58 | #include <asm/mmu.h> | 58 | #include <asm/mmu.h> |
59 | #include <asm/lmb.h> | 59 | #include <asm/lmb.h> |
60 | #include <asm/iSeries/ItLpNaca.h> | 60 | #include <asm/iSeries/ItLpNaca.h> |
61 | #include <asm/firmware.h> | ||
61 | 62 | ||
62 | #ifdef DEBUG | 63 | #ifdef DEBUG |
63 | #define DBG(fmt...) udbg_printf(fmt) | 64 | #define DBG(fmt...) udbg_printf(fmt) |
@@ -401,7 +402,8 @@ void __init early_setup(unsigned long dt_ptr) | |||
401 | /* | 402 | /* |
402 | * Initialize stab / SLB management | 403 | * Initialize stab / SLB management |
403 | */ | 404 | */ |
404 | stab_initialize(lpaca->stab_real); | 405 | if (!firmware_has_feature(FW_FEATURE_ISERIES)) |
406 | stab_initialize(lpaca->stab_real); | ||
405 | 407 | ||
406 | /* | 408 | /* |
407 | * Initialize the MMU Hash table and create the linear mapping | 409 | * Initialize the MMU Hash table and create the linear mapping |