aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-01-04 17:05:13 +1100
committerPaul Mackerras <paulus@samba.org>2007-01-09 17:03:03 +1100
commite9966ff85013be0ef56d3c76f3b4d5c02488d964 (patch)
treed2d95fd8dcc8370f4e14fcf3e4fc54d6d22d788a /arch/powerpc
parent13d2c9bbb09e37e8a231a36b279a97861d6d5407 (diff)
downloadkernel_samsung_aries-e9966ff85013be0ef56d3c76f3b4d5c02488d964.zip
kernel_samsung_aries-e9966ff85013be0ef56d3c76f3b4d5c02488d964.tar.gz
kernel_samsung_aries-e9966ff85013be0ef56d3c76f3b4d5c02488d964.tar.bz2
[POWERPC] iSeries: fix viopath initialisation
/proc/iSeries/config should only be created if we are running on legacy iSeries. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/platforms/iseries/viopath.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 84e7ee2..a6799ed 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -42,6 +42,7 @@
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/prom.h>
+#include <asm/firmware.h>
#include <asm/iseries/hv_types.h>
#include <asm/iseries/hv_lp_event.h>
#include <asm/iseries/hv_lp_config.h>
@@ -183,6 +184,9 @@ static int __init vio_proc_init(void)
{
struct proc_dir_entry *e;
+ if (!firmware_has_feature(FW_FEATURE_ISERIES))
+ return 0;
+
e = create_proc_entry("iSeries/config", 0, NULL);
if (e)
e->proc_fops = &proc_viopath_operations;