diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-12-08 11:18:47 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-12-08 11:18:47 -0500 |
| commit | c35fa3ea1ae8198bd65c2c6e59d9ebd68c115a59 (patch) | |
| tree | 878768b69df25459b448aa890352342c4a3c6e2d /arch/powerpc/kernel/sysfs.c | |
| parent | dcc7461eef7341e84e2f7274f904ce01a43b2506 (diff) | |
| parent | 218d11a8b071b23b76c484fd5f72a4fe3306801e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
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) { |