Skip to content

Commit e7f24a3

Browse files
committed
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
2 parents 46cd5b2 + 786a457 commit e7f24a3

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

arch/x86/kernel/relocate_kernel_64.S

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,14 @@ SYM_CODE_START_LOCAL_NOALIGN(identity_mapped)
136136
* %r13 original CR4 when relocate_kernel() was invoked
137137
*/
138138

139+
/*
140+
* Set return address to 0 if not preserving context. The purgatory
141+
* shipped in kexec-tools will unconditionally look for the return
142+
* address on the stack and set a kexec_jump_back_entry= command
143+
* line option if it's non-zero. There's no other way that it can
144+
* tell a preserve-context (kjump) kexec from a normal one.
145+
*/
146+
pushq $0
139147
/* store the start address on the stack */
140148
pushq %rdx
141149

0 commit comments

Comments
 (0)