[POWERPC] iSeries: fix mf proc initialisation

Stephen Rothwell sfr at canb.auug.org.au
Thu Jan 4 17:01:51 EST 2007


This proc file should only be created if we are running on legacy iSeries.

Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
---
 arch/powerpc/platforms/iseries/mf.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Paulus, this is a bug fix and prevents an OOPS when using a combined
kernel on anything other than iSeries hardware - tested on iSeries and
pSeries.  The following patches are similar.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index cff15ae..1ad0e4a 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -38,6 +38,7 @@
 #include <asm/uaccess.h>
 #include <asm/paca.h>
 #include <asm/abs_addr.h>
+#include <asm/firmware.h>
 #include <asm/iseries/vio.h>
 #include <asm/iseries/mf.h>
 #include <asm/iseries/hv_lp_config.h>
@@ -1235,6 +1236,9 @@ static int __init mf_proc_init(void)
 	char name[2];
 	int i;
 
+	if (!firmware_has_feature(FW_FEATURE_ISERIES))
+		return 0;
+
 	mf_proc_root = proc_mkdir("iSeries/mf", NULL);
 	if (!mf_proc_root)
 		return 1;
-- 
1.4.4.3




More information about the Linuxppc-dev mailing list