2 files changed, 4 insertions, 0 deletions

diff --git a/arch/x86/kernel/relocate_kernel_32.S b/arch/x86/kernel/relocate_kernel_32.S
index 41235531b11c..36818f8ec2be 100644
--- 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
 
diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
index 4de8f5b3d476..7a6f3b3be3cf 100644
--- a/arch/x86/kernel/relocate_kernel_64.S
+++ b/arch/x86/kernel/relocate_kernel_64.S
@@ -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