From: Boqun Feng <boqun.feng@gmail.com>
Date: Fri, 21 Feb 2025 05:52:01 +0000 (-0800)
Subject: Merge branches 'docs.2025.02.04a', 'lazypreempt.2025.02.20a', 'misc.2025.02.06a'... 
X-Git-Tag: next-20250224~58^2
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=83ad40ba2e4a9ce6c8d86d6c6ed349b8774c0c9d;p=linux%2F.git

Merge branches 'docs.2025.02.04a', 'lazypreempt.2025.02.20a', 'misc.2025.02.06a', 'srcu.2025.02.05a' and 'torture.2025.02.05a'
---

83ad40ba2e4a9ce6c8d86d6c6ed349b8774c0c9d
diff --cc kernel/rcu/rcutorture.c
index d26fb1d33ed9,de85a88810cf,d26fb1d33ed9,1bd3eaa0b8e7,be4e3c6b912f..d98b3bd6d91f
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@@@@@ -677,8 -677,8 -677,8 -677,9 -687,10 +687,11 @@@@@@ static void srcu_get_gp_data(int *flags
     static int srcu_torture_read_lock(void)
     {
     	int idx;
+++ +	struct srcu_ctr __percpu *scp;
     	int ret = 0;
     
++++ 	WARN_ON_ONCE(reader_flavor & ~SRCU_READ_FLAVOR_ALL);
++++ 
     	if ((reader_flavor & SRCU_READ_FLAVOR_NORMAL) || !(reader_flavor & SRCU_READ_FLAVOR_ALL)) {
     		idx = srcu_read_lock(srcu_ctlp);
     		WARN_ON_ONCE(idx & ~0x1);