x86, espfix: Make it possible to disable 16-bit support

[pandora-kernel.git] / arch / x86 / kernel / entry_64.S

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 3812ef6..67fd181 100644 (file)
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -865,8 +865,10 @@ irq_return:
         * Are we returning to a stack segment from the LDT?  Note: in
         * 64-bit mode SS:RSP on the exception stack is always valid.
         */
+#ifdef CONFIG_X86_ESPFIX64
        testb $4,(SS-RIP)(%rsp)
        jnz irq_return_ldt
+#endif
 
 irq_return_iret:
        INTERRUPT_RETURN
@@ -884,6 +886,7 @@ ENTRY(native_iret)
        .previous
 #endif
 
+#ifdef CONFIG_X86_ESPFIX64
 irq_return_ldt:
        pushq_cfi %rax
        pushq_cfi %rdi
@@ -907,6 +910,7 @@ irq_return_ldt:
        movq %rax,%rsp
        popq_cfi %rax
        jmp irq_return_iret
+#endif
 
        .section .fixup,"ax"
 bad_iret:
@@ -980,6 +984,7 @@ END(common_interrupt)
         * modify the stack to make it look like we just entered
         * the #GP handler from user space, similar to bad_iret.
         */
+#ifdef CONFIG_X86_ESPFIX64
        ALIGN
 __do_double_fault:
        XCPT_FRAME 1 RDI+8
@@ -1005,6 +1010,9 @@ __do_double_fault:
        retq
        CFI_ENDPROC
 END(__do_double_fault)
+#else
+# define __do_double_fault do_double_fault
+#endif
 
 /*
  * End of kprobes section