Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 773e3f93577ffb493fb7c39b1a6ecf39b5748e87

Authored by Paul E. McKenney
1 parent b3a084b9b6
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

rcu: move check from rcu_dereference_bh to rcu_read_lock_bh_held 

As suggested by Linus, push the irqs_disabled() down to the
rcu_read_lock_bh_held() level so that all callers get the benefit
of the correct check.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

include/linux/rcupdate.h
Diff comments   View file @ 773e3f9
... ... @@ -454,7 +454,7 @@
454 454 * Makes rcu_dereference_check() do the dirty work.
455 455 */
456 456 #define rcu_dereference_bh(p) \
457   - rcu_dereference_check(p, rcu_read_lock_bh_held() || irqs_disabled())
  457 + rcu_dereference_check(p, rcu_read_lock_bh_held())
458 458  
459 459 /**
460 460 * rcu_dereference_sched - fetch RCU-protected pointer, checking for RCU-sched
... ... @@ -86,7 +86,7 @@
86 86 {
87 87 if (!debug_lockdep_rcu_enabled())
88 88 return 1;
89   - return in_softirq();
  89 + return in_softirq() || irqs_disabled();
90 90 }
91 91 EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held);
92 92