diff --git a/[refs] b/[refs] index 3ebb6835df51..a279806ed6a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a09c17a6fdad9ae5b5ea1c3383080f84ec76ab20 +refs/heads/master: 012d3ca8d85bf3ae5278ba897dd1ca3999247107 diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c index e2bda18f6f42..c52f981ea008 100644 --- a/trunk/kernel/rcutorture.c +++ b/trunk/kernel/rcutorture.c @@ -401,7 +401,7 @@ static void srcu_torture_cleanup(void) cleanup_srcu_struct(&srcu_ctl); } -static int srcu_torture_read_lock(void) +static int srcu_torture_read_lock(void) __acquires(&srcu_ctl) { return srcu_read_lock(&srcu_ctl); } @@ -419,7 +419,7 @@ static void srcu_read_delay(struct rcu_random_state *rrsp) schedule_timeout_interruptible(longdelay); } -static void srcu_torture_read_unlock(int idx) +static void srcu_torture_read_unlock(int idx) __releases(&srcu_ctl) { srcu_read_unlock(&srcu_ctl, idx); }