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

+2
+2
arch/powerpc/kernel/sysfs.c
··· 717 717 718 718 BUG_ON(!c->hotpluggable); 719 719 720 + #ifdef CONFIG_PPC64 720 721 if (!firmware_has_feature(FW_FEATURE_ISERIES) && 721 722 cpu_has_feature(CPU_FTR_SMT)) 722 723 sysdev_remove_file(s, &attr_smt_snooze_delay); 724 + #endif 723 725 724 726 /* PMC stuff */ 725 727 switch (cur_cpu_spec->pmc_type) {