diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-27 20:06:10 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-27 20:06:10 +0300 |
| commit | 6be5f58215f1dcbd697a695ad5db9986c28c50c3 (patch) | |
| tree | 4a987abf93880357f67609c992dd203ac8eb2fbc /kernel/softirq.c | |
| parent | 2eeefc60ad70ffb7a5daf9f47aef5b1ebd1f39ad (diff) | |
| parent | 91ea62d58bd661827c328a2c6c02a87fa4aae88b (diff) | |
| download | linux-6be5f58215f1dcbd697a695ad5db9986c28c50c3.tar.xz | |
Merge tag 'locking-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"Misc fixes/updates:
- Fix static keys usage in module __init sections
- Add separate MAINTAINERS entry for static branches/calls
- Fix lockdep splat with CONFIG_PREEMPTIRQ_EVENTS=y tracing"
* tag 'locking-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
softirq: Avoid bad tracing / lockdep interaction
jump_label/static_call: Add MAINTAINERS
jump_label: Fix usage in module __init
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index d5bfd5e661fc..9d71046ea247 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -186,7 +186,7 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt) * Keep preemption disabled until we are done with * softirq processing: */ - preempt_count_sub(cnt - 1); + __preempt_count_sub(cnt - 1); if (unlikely(!in_interrupt() && local_softirq_pending())) { /* |