git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.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
4123553
..
36818f8
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:
ret
identity_mapped:
+ /* set return address to 0 if not preserving context */
+ pushl $0
/* store the start address on the stack */
pushl %edx
/* store the start address on the stack */
pushl %edx