From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 Sep 2006 03:27:17 +0000 (+1000)
Subject: [POWERPC] iSeries: set FW_FEATURE_ISERIES earlier
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~29870^2~7^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ef26a46f8c501f6888cc78bcc4a2dc1efea1e733;p=mirror_ubuntu-zesty-kernel.git

[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>
---

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();
 
 	/*