Merge branch 'akpm' (patches from Andrew)

[thirdparty/linux.git] / arch / x86 / boot / compressed / head_64.S

diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 4f7e6b84be0703a62849ce1c3d1ecd9c6a29a325..e821a7d7d5c4f8e5fa101c0e24961f2de1f11eeb 100644 (file)
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -42,6 +42,7 @@
        .hidden _ebss
        .hidden _got
        .hidden _egot
+       .hidden _end
 
        __HEAD
        .code32
@@ -393,6 +394,14 @@ SYM_CODE_START(startup_64)
        addq    %rax, 2(%rax)
        lgdt    (%rax)
 
+       /* Reload CS so IRET returns to a CS actually in the GDT */
+       pushq   $__KERNEL_CS
+       leaq    .Lon_kernel_cs(%rip), %rax
+       pushq   %rax
+       lretq
+
+.Lon_kernel_cs:
+
        /*
         * paging_prepare() sets up the trampoline and checks if we need to
         * enable 5-level paging.