diff --git a/[refs] b/[refs] index 85ce43f8d4c6..2491f74fce9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6ebcbb60c8c68a88160fe54302e851700d1362c +refs/heads/master: 143aa672f4fc643420c8325ad09c379ed33a27cf diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c index f7fe73e59c9f..045a3dc233ea 100644 --- a/trunk/kernel/rcutorture.c +++ b/trunk/kernel/rcutorture.c @@ -1700,7 +1700,7 @@ static int rcu_torture_barrier(void *arg) schedule_timeout_interruptible(HZ / 10); } while (!kthread_should_stop() && fullstop == FULLSTOP_DONTSTOP); VERBOSE_PRINTK_STRING("rcu_torture_barrier task stopping"); - rcutorture_shutdown_absorb("rcu_torture_barrier_cbs"); + rcutorture_shutdown_absorb("rcu_torture_barrier"); while (!kthread_should_stop()) schedule_timeout_interruptible(1); return 0;