Skip to content

Commit

Permalink
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…
Browse files Browse the repository at this point in the history
…/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Fix build for 32-bit SMP configs
  • Loading branch information
torvalds committed Dec 1, 2008
2 parents 2a1dc50 + a1e0eb1 commit ecf318c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/powerpc/kernel/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit ecf318c

Please sign in to comment.