This patch is intended for v3.10 and it should be considered RFC as I had only tested it under QEMU and not real hardware (that to be done on Friday).
The patch addresses a shortcomming of the git commite 7a5cd063c7b4c58417f674821d63f5eb6747e37 ("x86-64, gdt: Store/load GDT for ACPI S3 or hibernate/resume path is not needed.") where its assumption about restoring a kernel was incorrect. Specifically it assumed that a resumed kernel MUST be the same as the one booted. That is only true for 32-bit kernels but not for 64-bit. And as such it introduces a regression which the attached patch is fixing. The patch goes further and also lays the groundwork to make this work under a 32-bit kernel - even though it is not neccessary. This is done to unify the 32 and 64-bit code and make it easier in the future to unify the respective code closer. arch/x86/include/asm/suspend_32.h | 1 + arch/x86/include/asm/suspend_64.h | 2 ++ arch/x86/kernel/asm-offsets_32.c | 3 +++ arch/x86/kernel/asm-offsets_64.c | 1 + arch/x86/power/cpu.c | 15 ++++++++++----- arch/x86/power/hibernate_asm_32.S | 4 ++++ arch/x86/power/hibernate_asm_64.S | 3 +++ 7 files changed, 24 insertions(+), 5 deletions(-) Konrad Rzeszutek Wilk (1): x86, x86-64, gdt, hibernate: Store/load GDT for hibernate path. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/