diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-07-03 09:20:22 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-07-03 09:20:22 +0200 |
commit | 4520843dfa34417eb1e2061f60d2345d9ca614e1 (patch) | |
tree | 7b983b8cf20c6154cf897000610c5b7c754e26d9 /kernel/softirq.c | |
parent | 03585a95cd830e7a92697d2a8fe9a34df87563db (diff) | |
parent | 1cef1150ef40ec52f507436a14230cbc2623299c (diff) |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index de2f57fddc04..900dcfee542c 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -139,9 +139,13 @@ static void __local_bh_enable(unsigned int cnt) { lockdep_assert_irqs_disabled(); + if (preempt_count() == cnt) + trace_preempt_on(CALLER_ADDR0, get_lock_parent_ip()); + if (softirq_count() == (cnt & SOFTIRQ_MASK)) trace_softirqs_on(_RET_IP_); - preempt_count_sub(cnt); + + __preempt_count_sub(cnt); } /* |