From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 31 Jul 2023 01:54:01 +0000 (+1000)
Subject: Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=42990399f3224e7cd31bd1cbc966c4895d9617f2;p=users%2Fwilly%2Fpagecache.git

Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
---

42990399f3224e7cd31bd1cbc966c4895d9617f2
diff --cc kernel/rcu/rcu.h
index f95cfb5bf2eeb,5befd8780dcd3..98e13be411afd
--- a/kernel/rcu/rcu.h
+++ b/kernel/rcu/rcu.h
@@@ -507,8 -508,17 +507,16 @@@ void show_rcu_tasks_gp_kthreads(void)
  #else /* #ifdef CONFIG_TASKS_RCU_GENERIC */
  static inline void show_rcu_tasks_gp_kthreads(void) {}
  #endif /* #else #ifdef CONFIG_TASKS_RCU_GENERIC */
 -void rcu_request_urgent_qs_task(struct task_struct *t);
  #endif /* #else #ifdef CONFIG_TINY_RCU */
  
+ #ifdef CONFIG_TASKS_RCU
+ struct task_struct *get_rcu_tasks_gp_kthread(void);
+ #endif // # ifdef CONFIG_TASKS_RCU
+ 
+ #ifdef CONFIG_TASKS_RUDE_RCU
+ struct task_struct *get_rcu_tasks_rude_gp_kthread(void);
+ #endif // # ifdef CONFIG_TASKS_RUDE_RCU
+ 
  #define RCU_SCHEDULER_INACTIVE	0
  #define RCU_SCHEDULER_INIT	1
  #define RCU_SCHEDULER_RUNNING	2