Skip to content

Commit

Permalink
[POWERPC] iSeries: fix sysfs.c for combined build
Browse files Browse the repository at this point in the history 
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed Dec 4, 2006
1 parent b06a318 commit ad5cb17
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions arch/powerpc/kernel/sysfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -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 */

Expand Down

0 comments on commit ad5cb17

Please sign in to comment.