The following commit has been merged into the x86/entry branch of tip: Commit-ID: 10396895ab36357e676b894d89f64667ce226150 Gitweb: https://git.kernel.org/tip/10396895ab36357e676b894d89f64667ce226150 Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Wed, 03 Jun 2020 13:40:15 +02:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Wed, 03 Jun 2020 16:35:36 +02:00 x86/entry: Use __irq_exit_rcu() in irq_exit() Because if you rename a function, you should also rename the users. Fixes: b614345f52bc ("x86/entry: Clarify irq_{enter,exit}_rcu()") Reported-by: Qian Cai <cai@xxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Tested-by: Qian Cai <cai@xxxxxx> Link: https://lkml.kernel.org/r/20200602150511.GH706478@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Link: https://lkml.kernel.org/r/20200603114051.838509047@xxxxxxxxxxxxx --- kernel/softirq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/softirq.c b/kernel/softirq.c index a3eb6eb..c4201b7 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -438,7 +438,7 @@ void irq_exit_rcu(void) */ void irq_exit(void) { - irq_exit_rcu(); + __irq_exit_rcu(); rcu_irq_exit(); /* must be last! */ lockdep_hardirq_exit();