OSDN Git Service

cpu/SMT: Fix x86 link error without CONFIG_SYSFS
authorArnd Bergmann <arnd@arndb.de>
Tue, 10 Dec 2019 19:56:04 +0000 (20:56 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 9 Jan 2020 16:31:45 +0000 (17:31 +0100)
commitdc8d37ed304eeeea47e65fb9edc1c6c8b0093386
tree063253a50cea9d690c381d434e8efb0f92df0ade
parentc79f46a282390e0f5b306007bf7b11a46d529538
cpu/SMT: Fix x86 link error without CONFIG_SYSFS

When CONFIG_SYSFS is disabled, but CONFIG_HOTPLUG_SMT is enabled,
the kernel fails to link:

arch/x86/power/cpu.o: In function `hibernate_resume_nonboot_cpu_disable':
(.text+0x38d): undefined reference to `cpuhp_smt_enable'
arch/x86/power/hibernate.o: In function `arch_resume_nosmt':
hibernate.c:(.text+0x291): undefined reference to `cpuhp_smt_enable'
hibernate.c:(.text+0x29c): undefined reference to `cpuhp_smt_disable'

Move the exported functions out of the #ifdef section into its
own with the correct conditions.

The patch that caused this is marked for stable backports, so
this one may need to be backported as well.

Fixes: ec527c318036 ("x86/power: Fix 'nosmt' vs hibernation triple fault during resume")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Jiri Kosina <jkosina@suse.cz>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20191210195614.786555-1-arnd@arndb.de
kernel/cpu.c