tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds ecf318cc 2a1dc509

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