From: Paul E. McKenney <paulmck@kernel.org>
Date: Fri, 22 Jul 2022 00:46:18 +0000 (-0700)
Subject: Merge branch 'ctxt.2022.07.05a' into HEAD
X-Git-Tag: v6.6.17~6938^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34bc7b454dc31f75a0be7ee8ab378135523d7c51;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'ctxt.2022.07.05a' into HEAD

ctxt.2022.07.05a: Linux-kernel memory model development branch.
---

34bc7b454dc31f75a0be7ee8ab378135523d7c51
diff --cc kernel/rcu/tree_plugin.h
index 7ae1551,4a53aa0..438ecae
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@@ -595,7 -595,7 +595,7 @@@ static notrace bool rcu_preempt_need_de
   * evaluate safety in terms of interrupt, softirq, and preemption
   * disabling.
   */
- static notrace void rcu_preempt_deferred_qs(struct task_struct *t)
 -void rcu_preempt_deferred_qs(struct task_struct *t)
++notrace void rcu_preempt_deferred_qs(struct task_struct *t)
  {
  	unsigned long flags;
  
@@@ -935,7 -935,7 +935,7 @@@ static notrace bool rcu_preempt_need_de
  // period for a quiescent state from this CPU.  Note that requests from
  // tasks are handled when removing the task from the blocked-tasks list
  // below.
- static notrace void rcu_preempt_deferred_qs(struct task_struct *t)
 -void rcu_preempt_deferred_qs(struct task_struct *t)
++notrace void rcu_preempt_deferred_qs(struct task_struct *t)
  {
  	struct rcu_data *rdp = this_cpu_ptr(&rcu_data);