From: Uladzislau Rezki (Sony) <urezki@gmail.com>
Date: Tue, 16 Apr 2024 09:18:01 +0000 (+0200)
Subject: Merge branches 'fixes.2024.04.15a', 'misc.2024.04.12a', 'rcu-sync-normal-improve... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=64619b283bb35b12a96129e82b40304f7e5551b7;p=linux.git

Merge branches 'fixes.2024.04.15a', 'misc.2024.04.12a', 'rcu-sync-normal-improve.2024.04.15a', 'rcu-tasks.2024.04.15a' and 'rcutorture.2024.04.15a' into rcu-merge.2024.04.15a

fixes.2024.04.15a: RCU fixes
misc.2024.04.12a: Miscellaneous fixes
rcu-sync-normal-improve.2024.04.15a: Improving synchronize_rcu() call
rcu-tasks.2024.04.15a: Tasks RCU updates
rcutorture.2024.04.15a: Torture-test updates
---

64619b283bb35b12a96129e82b40304f7e5551b7
diff --cc kernel/rcu/tree.c
index 306f55b81d101,d9642dd06c253,1d5c000e5c7af,d9642dd06c253,60e79ed737003..28c7031711a3f
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@@@@@ -536,17 -508,17 -511,17 -508,17 -508,10 +539,10 @@@@@@ static struct rcu_node *rcu_get_root(vo
     /*
      * Send along grace-period-related data for rcutorture diagnostics.
      */
---- void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags,
---- 			    unsigned long *gp_seq)
  -  {
  -  	switch (test_type) {
  -  	case RCU_FLAVOR:
  -  		*flags = READ_ONCE(rcu_state.gp_flags);
  -  		*gp_seq = rcu_seq_current(&rcu_state.gp_seq);
  -  		break;
  -  	default:
  -  		break;
  -  	}
++++ void rcutorture_get_gp_data(int *flags, unsigned long *gp_seq)
  +  {
-- - 	switch (test_type) {
-- - 	case RCU_FLAVOR:
-- - 		*flags = READ_ONCE(rcu_state.gp_flags);
-- - 		*gp_seq = rcu_seq_current(&rcu_state.gp_seq);
-- - 		break;
-- - 	default:
-- - 		break;
-- - 	}
++++ 	*flags = READ_ONCE(rcu_state.gp_flags);
++++ 	*gp_seq = rcu_seq_current(&rcu_state.gp_seq);
     }
     EXPORT_SYMBOL_GPL(rcutorture_get_gp_data);