diff --git a/[refs] b/[refs] index c91705b5beff..dd967551efcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7061ca3b6c99fc78115560b9a10227c8c5fafc45 +refs/heads/master: 4410030646be072b82ec1892ad5cc7d91af384d8 diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c index e29edc374cec..a58ac285fc69 100644 --- a/trunk/kernel/rcutorture.c +++ b/trunk/kernel/rcutorture.c @@ -1399,7 +1399,7 @@ rcu_torture_shutdown(void *arg) * Execute random CPU-hotplug operations at the interval specified * by the onoff_interval. */ -static int +static int __cpuinit rcu_torture_onoff(void *arg) { int cpu; @@ -1447,7 +1447,7 @@ rcu_torture_onoff(void *arg) return 0; } -static int +static int __cpuinit rcu_torture_onoff_init(void) { if (onoff_interval <= 0)