diff options
Diffstat (limited to 'arch/x86/kernel/traps_64.c')
-rw-r--r-- | arch/x86/kernel/traps_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index efc66df728b6..045466681911 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
@@ -84,7 +84,7 @@ static inline void conditional_sti(struct pt_regs *regs) | |||
84 | 84 | ||
85 | static inline void preempt_conditional_sti(struct pt_regs *regs) | 85 | static inline void preempt_conditional_sti(struct pt_regs *regs) |
86 | { | 86 | { |
87 | preempt_disable(); | 87 | inc_preempt_count(); |
88 | if (regs->flags & X86_EFLAGS_IF) | 88 | if (regs->flags & X86_EFLAGS_IF) |
89 | local_irq_enable(); | 89 | local_irq_enable(); |
90 | } | 90 | } |
@@ -95,7 +95,7 @@ static inline void preempt_conditional_cli(struct pt_regs *regs) | |||
95 | local_irq_disable(); | 95 | local_irq_disable(); |
96 | /* Make sure to not schedule here because we could be running | 96 | /* Make sure to not schedule here because we could be running |
97 | on an exception stack. */ | 97 | on an exception stack. */ |
98 | preempt_enable_no_resched(); | 98 | dec_preempt_count(); |
99 | } | 99 | } |
100 | 100 | ||
101 | int kstack_depth_to_print = 12; | 101 | int kstack_depth_to_print = 12; |