diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-11 17:48:04 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-11 17:48:04 +0000 |
| commit | 460aa020f56c974a3e7e5b5378b2355fec6a2c11 (patch) | |
| tree | 959dc05609eec2a040245f43964ae5738ee741cb /kernel/entry/common.c | |
| parent | 031616c434db05ce766f76c62865f55698e0924f (diff) | |
| parent | 84de089e770b57280d87dff51be894b6fda18810 (diff) | |
Merge remote-tracking branch 'asoc/for-5.11' into asoc-next
Diffstat (limited to 'kernel/entry/common.c')
| -rw-r--r-- | kernel/entry/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c index 2b8366693d5c..e9e2df3f3f9e 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -337,10 +337,10 @@ noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs) * already contains a warning when RCU is not watching, so no point * in having another one here. */ + lockdep_hardirqs_off(CALLER_ADDR0); instrumentation_begin(); rcu_irq_enter_check_tick(); - /* Use the combo lockdep/tracing function */ - trace_hardirqs_off(); + trace_hardirqs_off_finish(); instrumentation_end(); return ret; |