[POWERPC] iSeries: fix proc/iSeries initialisation
From: Stephen Rothwell <hidden>
Date: 2007-01-04 06:03:11
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
These proc files should only be created if we are running on legacy iSeries. Signed-off-by: Stephen Rothwell <redacted> --- arch/powerpc/platforms/iseries/proc.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c
index c241413..b54e371 100644
--- a/arch/powerpc/platforms/iseries/proc.c
+++ b/arch/powerpc/platforms/iseries/proc.c@@ -24,6 +24,7 @@ #include <asm/processor.h> #include <asm/time.h> #include <asm/lppaca.h> +#include <asm/firmware.h> #include <asm/iseries/hv_call_xm.h> #include "processor_vpd.h"
@@ -31,7 +32,12 @@ static int __init iseries_proc_create(void) { - struct proc_dir_entry *e = proc_mkdir("iSeries", 0); + struct proc_dir_entry *e; + + if (!firmware_has_feature(FW_FEATURE_ISERIES)) + return 0; + + e = proc_mkdir("iSeries", 0); if (!e) return 1;
@@ -106,6 +112,9 @@ static int __init iseries_proc_init(void) { struct proc_dir_entry *e; + if (!firmware_has_feature(FW_FEATURE_ISERIES)) + return 0; + e = create_proc_entry("iSeries/titanTod", S_IFREG|S_IRUGO, NULL); if (e) e->proc_fops = &proc_titantod_operations;
--
1.4.4.3