From: Andrew Morton - Don't initialse already-zero variables to zero - rcu_idle_cpu should have static scope - Fit it into an 80-col display. Cc: Srivatsa Vaddagiri Cc: Dipankar Sarma Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton --- kernel/rcutorture.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff -puN kernel/rcutorture.c~extend-rcu-torture-module-to-test-tickless-idle-cpu-fixes kernel/rcutorture.c --- 25/kernel/rcutorture.c~extend-rcu-torture-module-to-test-tickless-idle-cpu-fixes Wed Dec 7 16:45:03 2005 +++ 25-akpm/kernel/rcutorture.c Wed Dec 7 16:45:03 2005 @@ -48,10 +48,10 @@ MODULE_LICENSE("GPL"); static int nreaders = -1; /* # reader threads, defaults to 4*ncpus */ -static int stat_interval = 0; /* Interval between stats, in seconds. */ +static int stat_interval; /* Interval between stats, in seconds. */ /* Defaults to "only at end of test". */ -static int verbose = 0; /* Print more debug info. */ -static int test_no_idle_hz = 0; /* Test RCU's support for tickless idle CPUs. */ +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)*/ MODULE_PARM(nreaders, "i"); @@ -382,7 +382,7 @@ rcu_torture_stats(void *arg) return 0; } -int rcu_idle_cpu; /* Force all torture tasks off this CPU */ +static int rcu_idle_cpu; /* Force all torture tasks off this CPU */ /* Shuffle tasks such that we allow @rcu_idle_cpu to become idle. A special case * is when @rcu_idle_cpu = -1, when we allow the tasks to run on all CPUs. @@ -501,10 +501,11 @@ rcu_torture_init(void) nrealreaders = nreaders; else nrealreaders = 2 * num_online_cpus(); - printk(KERN_ALERT TORTURE_FLAG - "--- Start of test: nreaders=%d stat_interval=%d verbose=%d test_no_idle_hz=%d shuffle_interval = %d\n", - nrealreaders, stat_interval, verbose, test_no_idle_hz, - shuffle_interval); + printk(KERN_ALERT TORTURE_FLAG "--- Start of test: nreaders=%d " + "stat_interval=%d verbose=%d test_no_idle_hz=%d " + "shuffle_interval = %d\n", + nrealreaders, stat_interval, verbose, test_no_idle_hz, + shuffle_interval); fullstop = 0; /* Set up the freelist. */ _