Commit e7f24a38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-urgent-2026-05-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fix from Ingo Molnar:

 - Fix x86 boot crash for non-kjump kexecs (David Woodhouse)

* tag 'x86-urgent-2026-05-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kexec: Push kjump return address even for non-kjump kexec
parents 46cd5b22 786a4575

arch/x86/kernel/relocate_kernel_64.S

+8 −0
Original line number Diff line number Diff line
@@ -136,6 +136,14 @@ SYM_CODE_START_LOCAL_NOALIGN(identity_mapped) 
	 * %r13 original CR4 when relocate_kernel() was invoked

	 */



	/*

	 * Set return address to 0 if not preserving context. The purgatory

	 * shipped in kexec-tools will unconditionally look for the return

	 * address on the stack and set a kexec_jump_back_entry= command

	 * line option if it's non-zero. There's no other way that it can

	 * tell a preserve-context (kjump) kexec from a normal one.

	 */

	pushq	$0

	/* store the start address on the stack */

	pushq   %rdx