summaryrefslogtreecommitdiffstats
path: root/kernel/softirq.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r--kernel/softirq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 53cc09ceb0b8..a90de70cf1f3 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -106,7 +106,7 @@ static void __local_bh_disable(unsigned long ip, unsigned int cnt)
106 * We must manually increment preempt_count here and manually 106 * We must manually increment preempt_count here and manually
107 * call the trace_preempt_off later. 107 * call the trace_preempt_off later.
108 */ 108 */
109 preempt_count() += cnt; 109 add_preempt_count_notrace(cnt);
110 /* 110 /*
111 * Were softirqs turned off above: 111 * Were softirqs turned off above:
112 */ 112 */
@@ -256,7 +256,7 @@ restart:
256 " exited with %08x?\n", vec_nr, 256 " exited with %08x?\n", vec_nr,
257 softirq_to_name[vec_nr], h->action, 257 softirq_to_name[vec_nr], h->action,
258 prev_count, preempt_count()); 258 prev_count, preempt_count());
259 preempt_count() = prev_count; 259 preempt_count_set(prev_count);
260 } 260 }
261 261
262 rcu_bh_qs(cpu); 262 rcu_bh_qs(cpu);