Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'x86-urgent-2026-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Ingo Molnar:
"Work around S2RAM hang if the firmware unexpectedly re-enables the
x2apic hardware while it was disabled by the kernel.
Force-disable it again and issue a warning into the syslog"
* tag 'x86-urgent-2026-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/apic: Disable x2apic on resume if the kernel expects so
+6
+6
arch/x86/kernel/apic/apic.c
+6
arch/x86/kernel/apic/apic.c
···
1894
1894
1895
1895
static inline void try_to_enable_x2apic(int remap_mode) { }
1896
1896
static inline void __x2apic_enable(void) { }
1897
+
static inline void __x2apic_disable(void) { }
1897
1898
#endif /* !CONFIG_X86_X2APIC */
1898
1899
1899
1900
void __init enable_IR_x2apic(void)
···
2457
2456
if (x2apic_mode) {
2458
2457
__x2apic_enable();
2459
2458
} else {
2459
+
if (x2apic_enabled()) {
2460
+
pr_warn_once("x2apic: re-enabled by firmware during resume. Disabling\n");
2461
+
__x2apic_disable();
2462
+
}
2463
+
2460
2464
/*
2461
2465
* Make sure the APICBASE points to the right address
2462
2466
*