diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 05:05:26 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 05:05:26 -0500 |
| commit | c0515566f3117c44b0572559bcc3cb00899b0910 (patch) | |
| tree | 3c7e36ed6e78812b9276a81d6b3a2e80788003c5 /arch/powerpc/kernel/sysfs.c | |
| parent | 4385cecf1f5866fb33fc95e2ee26a44e9b6f6be2 (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
Merge commit 'v2.6.28-rc7' into x86/cleanups
Diffstat (limited to 'arch/powerpc/kernel/sysfs.c')
| -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) | |||
| 717 | 717 | ||
| 718 | BUG_ON(!c->hotpluggable); | 718 | BUG_ON(!c->hotpluggable); |
| 719 | 719 | ||
| 720 | #ifdef CONFIG_PPC64 | ||
| 720 | if (!firmware_has_feature(FW_FEATURE_ISERIES) && | 721 | if (!firmware_has_feature(FW_FEATURE_ISERIES) && |
| 721 | cpu_has_feature(CPU_FTR_SMT)) | 722 | cpu_has_feature(CPU_FTR_SMT)) |
| 722 | sysdev_remove_file(s, &attr_smt_snooze_delay); | 723 | sysdev_remove_file(s, &attr_smt_snooze_delay); |
| 724 | #endif | ||
| 723 | 725 | ||
| 724 | /* PMC stuff */ | 726 | /* PMC stuff */ |
| 725 | switch (cur_cpu_spec->pmc_type) { | 727 | switch (cur_cpu_spec->pmc_type) { |