diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 16:58:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 16:58:23 +0100 |
| commit | ecf318cc3daee6f41354cc781e2d4b766f7eec3e (patch) | |
| tree | fe0a447b6859a35a3cee1c91c105fc95bb6e4965 /arch | |
| parent | vmscan: protect zone rotation stats by lru lock (diff) | |
| parent | powerpc: Fix build for 32-bit SMP configs (diff) | |
| download | linux-ecf318cc3daee6f41354cc781e2d4b766f7eec3e.tar.xz linux-ecf318cc3daee6f41354cc781e2d4b766f7eec3e.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Fix build for 32-bit SMP configs
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/sysfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index 86a2ffccef25..20885a38237a 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -717,9 +717,11 @@ static void unregister_cpu_online(unsigned int cpu) BUG_ON(!c->hotpluggable); +#ifdef CONFIG_PPC64 if (!firmware_has_feature(FW_FEATURE_ISERIES) && cpu_has_feature(CPU_FTR_SMT)) sysdev_remove_file(s, &attr_smt_snooze_delay); +#endif /* PMC stuff */ switch (cur_cpu_spec->pmc_type) { |