]> www.infradead.org Git - users/jedix/linux-maple.git/commit
x86: Fix build regression with CONFIG_KEXEC_JUMP enabled
authorDamien Le Moal <dlemoal@kernel.org>
Sun, 8 Dec 2024 23:53:32 +0000 (08:53 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Dec 2024 18:13:28 +0000 (10:13 -0800)
commitaeb68937614f4aeceaaa762bd7f0212ce842b797
tree3298b4d81568875e6a72e2627b0a7ca254e72f54
parent32913f348229c9f72dda45fc2c08c6d9dfcd3d6d
x86: Fix build regression with CONFIG_KEXEC_JUMP enabled

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 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>
Acked-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: David Woodhouse <dwmw@amazon.co.uk>
Closes: https://lore.kernel.org/oe-kbuild-all/202411270006.ZyyzpYf8-lkp@intel.com/
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/kernel/relocate_kernel_64.S