diff --git a/[refs] b/[refs] index d153195da4f3..c09a0fd8881d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff2c93a5373f12f86f3281705d11278a9f2334e2 +refs/heads/master: 3c29e03d9121e07714fb9e5303d9b026800ffd5a diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c index 7b965341b1dc..021d3108bb6e 100644 --- a/trunk/kernel/rcutorture.c +++ b/trunk/kernel/rcutorture.c @@ -55,7 +55,7 @@ static int stat_interval; /* Interval between stats, in seconds. */ static int verbose; /* Print more debug info. */ static int test_no_idle_hz; /* Test RCU's support for tickless idle CPUs. */ static int shuffle_interval = 5; /* Interval between shuffles (in sec)*/ -static char *torture_type = "rcu"; /* What to torture: rcu, srcu. */ +static char *torture_type = "rcu"; /* What to torture: rcu, rcu_bh, srcu. */ module_param(nreaders, int, 0); MODULE_PARM_DESC(nreaders, "Number of RCU reader threads");