From ef26a46f8c501f6888cc78bcc4a2dc1efea1e733 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 25 Sep 2006 13:27:17 +1000 Subject: [PATCH] [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 --- arch/powerpc/platforms/iseries/setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 7f1953066f..7cb6b5f7c5 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(); /* -- 2.39.5