Parallel bootup on systems that use x2apic broke suspend to ram. This series ensures x2apic is re-enabled at startup and fixes an exposed pre-emption issue. Mario Limonciello (2): x86: Enable x2apic during resume from suspend if used previously perf/x86/amd: Stop calling amd_pmu_cpu_reset() from amd_pmu_cpu_dead() arch/x86/events/amd/core.c | 7 ++++++- arch/x86/include/asm/smp.h | 1 + arch/x86/kernel/acpi/sleep.c | 13 +++++++++---- arch/x86/kernel/head_64.S | 15 +++++++++++++++ 4 files changed, 31 insertions(+), 5 deletions(-) -- 2.34.1