Browse Source

[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>
Stephen Rothwell 18 years ago
parent
commit
ef26a46f8c
1 changed files with 3 additions and 3 deletions
  1. 3 3
      arch/powerpc/platforms/iseries/setup.c

+ 3 - 3
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"))
 	if (!of_flat_dt_is_compatible(root, "IBM,iSeries"))
 		return 0;
 		return 0;
 
 
-	powerpc_firmware_features |= FW_FEATURE_ISERIES;
-	powerpc_firmware_features |= FW_FEATURE_LPAR;
-
 	hpte_init_iSeries();
 	hpte_init_iSeries();
 
 
 	return 1;
 	return 1;
@@ -687,6 +684,9 @@ void * __init iSeries_early_setup(void)
 {
 {
 	unsigned long phys_mem_size;
 	unsigned long phys_mem_size;
 
 
+	powerpc_firmware_features |= FW_FEATURE_ISERIES;
+	powerpc_firmware_features |= FW_FEATURE_LPAR;
+
 	iSeries_fixup_klimit();
 	iSeries_fixup_klimit();
 
 
 	/*
 	/*