diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2005-09-23 14:50:25 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-23 14:50:25 +1000 |
| commit | 7c6f947f2477f7c0017be1af458eb5e0b96b7f40 (patch) | |
| tree | abb7a4387a8b1ab531fa1746ddd88f9215bc8449 /arch/ppc64 | |
| parent | 4c55130b2aa93370f1bf52d2304394e91cf8ee39 (diff) | |
| download | blackbird-op-linux-7c6f947f2477f7c0017be1af458eb5e0b96b7f40.tar.gz blackbird-op-linux-7c6f947f2477f7c0017be1af458eb5e0b96b7f40.zip | |
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>
Diffstat (limited to 'arch/ppc64')
| -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 @@ #include <asm/mmu.h> #include <asm/lmb.h> #include <asm/iSeries/ItLpNaca.h> +#include <asm/firmware.h> #ifdef DEBUG #define DBG(fmt...) udbg_printf(fmt) @@ -401,7 +402,8 @@ void __init early_setup(unsigned long dt_ptr) /* * Initialize stab / SLB management */ - stab_initialize(lpaca->stab_real); + if (!firmware_has_feature(FW_FEATURE_ISERIES)) + stab_initialize(lpaca->stab_real); /* * Initialize the MMU Hash table and create the linear mapping |
