public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86: Fix build regression with CONFIG_KEXEC_JUMP enabled
@ 2024-12-08 23:53 Damien Le Moal
  2024-12-09 10:29 ` Borislav Petkov
  0 siblings, 1 reply; 10+ messages in thread
From: Damien Le Moal @ 2024-12-08 23:53 UTC (permalink / raw)
  To: Linus Torvalds, David Woodhouse, Ingo Molnar, Thomas Gleixner,
	x86, linux-kernel

Build 6.13-rc12 for x86_64 with gcc 14.2.1 fails with the error:

ld: vmlinux.o: in function `virtual_mapped':
linux/arch/x86/kernel/relocate_kernel_64.S:249:(.text+0x5915b): undefined reference to `saved_context_gdt_desc'

when CONFIG_KEXEC_JUMP is enabled. This regression was introduced by
commit 07fa619f2a40 ("x86/kexec: Restore GDT on return from
::preserve_context kexec") which introduced a use of
saved_context_gdt_desc without a declaration for it. Fix that by
including asm/asm-offsets.h where saved_context_gdt_desc is defined
(indirectly in include/generated/asm-offsets.h which asm/asm-offsets.h
includes).

Fixes: 07fa619f2a40 ("x86/kexec: Restore GDT on return from ::preserve_context kexec")
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
---
 arch/x86/kernel/relocate_kernel_64.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
index 1236f25fc8d1..540443d699e3 100644
--- a/arch/x86/kernel/relocate_kernel_64.S
+++ b/arch/x86/kernel/relocate_kernel_64.S
@@ -13,6 +13,7 @@
 #include <asm/pgtable_types.h>
 #include <asm/nospec-branch.h>
 #include <asm/unwind_hints.h>
+#include <asm/asm-offsets.h>
 
 /*
  * Must be relocatable PIC code callable as a C function, in particular
-- 
2.47.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2024-12-09 22:22 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-08 23:53 [PATCH] x86: Fix build regression with CONFIG_KEXEC_JUMP enabled Damien Le Moal
2024-12-09 10:29 ` Borislav Petkov
2024-12-09 10:34   ` Damien Le Moal
2024-12-09 13:54     ` Borislav Petkov
2024-12-09 15:59   ` [EXTERNAL] " David Woodhouse
2024-12-09 16:22     ` Borislav Petkov
2024-12-09 17:07       ` David Woodhouse
2024-12-09 17:18         ` Borislav Petkov
2024-12-09 21:52           ` David Woodhouse
2024-12-09 22:22             ` Borislav Petkov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox