diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-11-13 14:46:04 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 20:39:14 +1100 |
| commit | ad5cb17f730ae49e494cfd680a5c62f81c3ca484 (patch) | |
| tree | 886d9523279aa65884d0088020a2c7d92cad9d14 /arch/powerpc/kernel/sysfs.c | |
| parent | b06a318372ba95873abfe323076bd7e115d64b67 (diff) | |
| download | kernel_samsung_smdk4412-ad5cb17f730ae49e494cfd680a5c62f81c3ca484.zip kernel_samsung_smdk4412-ad5cb17f730ae49e494cfd680a5c62f81c3ca484.tar.gz kernel_samsung_smdk4412-ad5cb17f730ae49e494cfd680a5c62f81c3ca484.tar.bz2 | |
[POWERPC] iSeries: fix sysfs.c for combined build
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/sysfs.c')
| -rw-r--r-- | arch/powerpc/kernel/sysfs.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index cda21a2..22123a0 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -200,10 +200,9 @@ static void register_cpu_online(unsigned int cpu) struct cpu *c = &per_cpu(cpu_devices, cpu); struct sys_device *s = &c->sysdev; -#ifndef CONFIG_PPC_ISERIES - if (cpu_has_feature(CPU_FTR_SMT)) + if (!firmware_has_feature(FW_FEATURE_ISERIES) && + cpu_has_feature(CPU_FTR_SMT)) sysdev_create_file(s, &attr_smt_snooze_delay); -#endif /* PMC stuff */ @@ -242,10 +241,9 @@ static void unregister_cpu_online(unsigned int cpu) BUG_ON(c->no_control); -#ifndef CONFIG_PPC_ISERIES - if (cpu_has_feature(CPU_FTR_SMT)) + if (!firmware_has_feature(FW_FEATURE_ISERIES) && + cpu_has_feature(CPU_FTR_SMT)) sysdev_remove_file(s, &attr_smt_snooze_delay); -#endif /* PMC stuff */ |