diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-10-30 12:49:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-18 19:18:48 +0100 |
| commit | 0f4eb125c56b524776a2f396bb7a7c119bb2e0a1 (patch) | |
| tree | 0a06129e1cfdbbd39c0fcc822b6ef9daa19a3c1f /kernel/events | |
| parent | d302e78731143479d203a05fff648270502ab770 (diff) | |
| download | linux-stable-0f4eb125c56b524776a2f396bb7a7c119bb2e0a1.tar.gz linux-stable-0f4eb125c56b524776a2f396bb7a7c119bb2e0a1.tar.bz2 linux-stable-0f4eb125c56b524776a2f396bb7a7c119bb2e0a1.zip | |
perf: Fix get_recursion_context()
[ Upstream commit ce0f17fc93f63ee91428af10b7b2ddef38cd19e5 ]
One should use in_serving_softirq() to detect SoftIRQ context.
Fixes: 96f6d4444302 ("perf_counter: avoid recursion")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20201030151955.120572175@infradead.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel/events')
| -rw-r--r-- | kernel/events/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/internal.h b/kernel/events/internal.h index 6dc725a7e7bc..8fc0ddc38cb6 100644 --- a/kernel/events/internal.h +++ b/kernel/events/internal.h @@ -209,7 +209,7 @@ static inline int get_recursion_context(int *recursion) rctx = 3; else if (in_irq()) rctx = 2; - else if (in_softirq()) + else if (in_serving_softirq()) rctx = 1; else rctx = 0; |