git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
kexec, x86: Fix incorrect jump back address if not preserving context
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
relocate_kernel_32.S
diff --git
a/arch/x86/kernel/relocate_kernel_32.S
b/arch/x86/kernel/relocate_kernel_32.S
index 41235531b11ca894c809f9ae97f4d3c4f14791a4..36818f8ec2be08dd8ccdc6872992e5877eba40cd 100644
(file)
--- a/
arch/x86/kernel/relocate_kernel_32.S
+++ b/
arch/x86/kernel/relocate_kernel_32.S
@@
-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