diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-01-04 17:01:51 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-01-09 17:03:03 +1100 |
| commit | d9523aa157e9fbb93467dcd0d1bed9604153bf7f (patch) | |
| tree | 373df43d5fb29b41b3ce23b37786f9ee1a9bc214 /arch | |
| parent | 7232846b8d682a56407839e3774d03be0c7806c8 (diff) | |
| download | op-kernel-dev-d9523aa157e9fbb93467dcd0d1bed9604153bf7f.zip op-kernel-dev-d9523aa157e9fbb93467dcd0d1bed9604153bf7f.tar.gz | |
[POWERPC] iSeries: fix mf proc initialisation
This proc file should only be created if we are running on legacy
iSeries. Since we can now run the same kernel on legacy iSeries and
other machines, we currently get the /proc/iSeries directory and the
files in it on non-iSeries machines, and accessing them causes an oops
in some cases. This and the following patches make sure that these
files are not created on non-iSeries machines, thus avoiding the oops.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/iseries/mf.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |
