]> Gentwo Git Trees - linux/.git/commitdiff
Merge branches 'docs.2025.02.04a', 'lazypreempt.2025.02.20a', 'misc.2025.02.06a'...
authorBoqun Feng <boqun.feng@gmail.com>
Fri, 21 Feb 2025 05:52:01 +0000 (21:52 -0800)
committerBoqun Feng <boqun.feng@gmail.com>
Fri, 21 Feb 2025 05:52:01 +0000 (21:52 -0800)
1  2  3  4  5 
include/linux/rcupdate.h
include/linux/srcutiny.h
kernel/rcu/Kconfig
kernel/rcu/rcu.h
kernel/rcu/rcutorture.c
kernel/rcu/srcutiny.c
kernel/rcu/srcutree.c
kernel/rcu/tree.c

Simple merge
Simple merge
Simple merge
Simple merge
index d26fb1d33ed9ae60e87ab8a2ec919bce8cd89d42,de85a88810cf6bdc3d70f737baeca2e9c744ab91,d26fb1d33ed9ae60e87ab8a2ec919bce8cd89d42,1bd3eaa0b8e7ac258273241313a6a90406faa470,be4e3c6b912fe36342583d16cc00f237f8b193e5..d98b3bd6d91f4fc2489afb3c19db36d2c47e7aea
@@@@@@ -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);
Simple merge
Simple merge
Simple merge