1 files changed, 12 insertions, 10 deletions

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 33399176512a..9288ccfcf6db 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -88,9 +88,10 @@ static inline void conditional_sti(struct pt_regs *regs)
                 local_irq_enable();
 }
 
-static inline void preempt_conditional_sti(struct pt_regs *regs)
+static inline void preempt_conditional_sti(struct pt_regs *regs, int stack)
 {
-        inc_preempt_count();
+        if (stack)
+                inc_preempt_count();
         if (regs->flags & X86_EFLAGS_IF)
                 local_irq_enable();
 }
@@ -101,11 +102,12 @@ static inline void conditional_cli(struct pt_regs *regs)
                 local_irq_disable();
 }
 
-static inline void preempt_conditional_cli(struct pt_regs *regs)
+static inline void preempt_conditional_cli(struct pt_regs *regs, int stack)
 {
         if (regs->flags & X86_EFLAGS_IF)
                 local_irq_disable();
-        dec_preempt_count();
+        if (stack)
+                dec_preempt_count();
 }
 
 #ifdef CONFIG_X86_32
@@ -232,9 +234,9 @@ dotraplinkage void do_stack_segment(struct pt_regs *regs, long error_code)
         if (notify_die(DIE_TRAP, "stack segment", regs, error_code,
                         12, SIGBUS) == NOTIFY_STOP)
                 return;
-        preempt_conditional_sti(regs);
+        preempt_conditional_sti(regs, STACKFAULT_STACK);
         do_trap(12, SIGBUS, "stack segment", regs, error_code, NULL);
-        preempt_conditional_cli(regs);
+        preempt_conditional_cli(regs, STACKFAULT_STACK);
 }
 
 dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
@@ -470,9 +472,9 @@ dotraplinkage void __kprobes do_int3(struct pt_regs *regs, long error_code)
                 return;
 #endif
 
-        preempt_conditional_sti(regs);
+        preempt_conditional_sti(regs, DEBUG_STACK);
         do_trap(3, SIGTRAP, "int3", regs, error_code, NULL);
-        preempt_conditional_cli(regs);
+        preempt_conditional_cli(regs, DEBUG_STACK);
 }
 
 #ifdef CONFIG_X86_64
@@ -554,7 +556,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
                 return;
 
         /* It's safe to allow irq's after DR6 has been saved */
-        preempt_conditional_sti(regs);
+        preempt_conditional_sti(regs, DEBUG_STACK);
 
         if (regs->flags & X86_VM_MASK) {
                 handle_vm86_trap((struct kernel_vm86_regs *) regs,
@@ -577,7 +579,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
         si_code = get_si_code(tsk->thread.debugreg6);
         if (tsk->thread.debugreg6 & (DR_STEP | DR_TRAP_BITS))
                 send_sigtrap(tsk, regs, error_code, si_code);
-        preempt_conditional_cli(regs);
+        preempt_conditional_cli(regs, DEBUG_STACK);
 
         return;
 }