x86/kexec change for v3.1

GIT PULL Ingo Molnar 1 participant 1 message Jul 23, 2011 x86

lore

Share & tools

lore

Ingo Molnar

author

2011-07-23 09:26 UTC #0 lore raw

Linus,

Please pull the latest x86-kexec-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-kexec-for-linus

Thanks,

Ingo

------------------>
Huang Ying (1):
kexec, x86: Fix incorrect jump back address if not preserving context

 arch/x86/kernel/relocate_kernel_32.S |    2 ++
 arch/x86/kernel/relocate_kernel_64.S |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

arch/x86/kernel/relocate_kernel_32.S +2 -0

index 4123553..36818f8 100644
@@ -97,6 +97,8 @@ relocate_kernel:
 	ret
 
 identity_mapped:
+	/* set return address to 0 if not preserving context */
+	pushl	$0
 	/* store the start address on the stack */
 	pushl   %edx

arch/x86/kernel/relocate_kernel_64.S +2 -0

index 4de8f5b..7a6f3b3 100644
@@ -100,6 +100,8 @@ relocate_kernel:
 	ret
 
 identity_mapped:
+	/* set return address to 0 if not preserving context */
+	pushq	$0
 	/* store the start address on the stack */
 	pushq   %rdx