Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / x86 / entry / entry_64.S

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index f07b4efb34d5b0205db483f217c3c7e4d98b84e2..607d72c4a485cf25a3e582804cea0b7c031e1d32 100644 (file)
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -212,7 +212,7 @@ entry_SYSCALL_64_fastpath:
         * If we see that no exit work is required (which we are required
         * to check with IRQs off), then we can go straight to SYSRET64.
         */
-       DISABLE_INTERRUPTS(CLBR_NONE)
+       DISABLE_INTERRUPTS(CLBR_ANY)
        TRACE_IRQS_OFF
        movq    PER_CPU_VAR(current_task), %r11
        testl   $_TIF_ALLWORK_MASK, TASK_TI_flags(%r11)
@@ -233,7 +233,7 @@ entry_SYSCALL_64_fastpath:
         * raise(3) will trigger this, for example.  IRQs are off.
         */
        TRACE_IRQS_ON
-       ENABLE_INTERRUPTS(CLBR_NONE)
+       ENABLE_INTERRUPTS(CLBR_ANY)
        SAVE_EXTRA_REGS
        movq    %rsp, %rdi
        call    syscall_return_slowpath /* returns with IRQs disabled */
@@ -340,7 +340,7 @@ ENTRY(stub_ptregs_64)
         * Called from fast path -- disable IRQs again, pop return address
         * and jump to slow path
         */
-       DISABLE_INTERRUPTS(CLBR_NONE)
+       DISABLE_INTERRUPTS(CLBR_ANY)
        TRACE_IRQS_OFF
        popq    %rax
        jmp     entry_SYSCALL64_slow_path
@@ -515,7 +515,7 @@ common_interrupt:
        interrupt do_IRQ
        /* 0(%rsp): old RSP */
 ret_from_intr:
-       DISABLE_INTERRUPTS(CLBR_NONE)
+       DISABLE_INTERRUPTS(CLBR_ANY)
        TRACE_IRQS_OFF
        decl    PER_CPU_VAR(irq_count)
 
@@ -1048,7 +1048,7 @@ END(paranoid_entry)
  * On entry, ebx is "no swapgs" flag (1: don't need swapgs, 0: need it)
  */
 ENTRY(paranoid_exit)
-       DISABLE_INTERRUPTS(CLBR_NONE)
+       DISABLE_INTERRUPTS(CLBR_ANY)
        TRACE_IRQS_OFF_DEBUG
        testl   %ebx, %ebx                      /* swapgs needed? */
        jnz     paranoid_exit_no_swapgs
@@ -1153,10 +1153,9 @@ END(error_entry)
  *   0: user gsbase is loaded, we need SWAPGS and standard preparation for return to usermode
  */
 ENTRY(error_exit)
-       movl    %ebx, %eax
-       DISABLE_INTERRUPTS(CLBR_NONE)
+       DISABLE_INTERRUPTS(CLBR_ANY)
        TRACE_IRQS_OFF
-       testl   %eax, %eax
+       testl   %ebx, %ebx
        jnz     retint_kernel
        jmp     retint_user
 END(error_exit)