summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-09-25 13:27:17 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2006-09-25 13:27:17 +1000
commitef26a46f8c501f6888cc78bcc4a2dc1efea1e733 (patch)
treeffd373d9b241d1e1bfab67d185b807219fdcd64d /arch/powerpc
parente6e5fee1426bef07f4e6c3c76f48343c14207938 (diff)
downloadblackbird-op-linux-ef26a46f8c501f6888cc78bcc4a2dc1efea1e733.tar.gz
blackbird-op-linux-ef26a46f8c501f6888cc78bcc4a2dc1efea1e733.zip
[POWERPC] iSeries: set FW_FEATURE_ISERIES earlier
This will help in the combined kernel as some really early things depend on being able to check this. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/iseries/setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 7f1953066ff8..7cb6b5f7c593 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -655,9 +655,6 @@ static int __init iseries_probe(void)
if (!of_flat_dt_is_compatible(root, "IBM,iSeries"))
return 0;
- powerpc_firmware_features |= FW_FEATURE_ISERIES;
- powerpc_firmware_features |= FW_FEATURE_LPAR;
-
hpte_init_iSeries();
return 1;
@@ -687,6 +684,9 @@ void * __init iSeries_early_setup(void)
{
unsigned long phys_mem_size;
+ powerpc_firmware_features |= FW_FEATURE_ISERIES;
+ powerpc_firmware_features |= FW_FEATURE_LPAR;
+
iSeries_fixup_klimit();
/*
OpenPOWER on IntegriCloud