On Thu, Sep 11, 2014 at 08:40:16PM -0700, Davidlohr Bueso wrote:
> ... to just 'torture_runnable'. It follows other variable naming
> and is shorter.
>
> Signed-off-by: Davidlohr Bueso <dbu...@suse.de>
Looks good -- and please see below for the corresponding change to the
locktorture scripting. (Which I have queued separately after this change.)
> ---
> kernel/locking/locktorture.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
> index 0955b88..8c770b2 100644
> --- a/kernel/locking/locktorture.c
> +++ b/kernel/locking/locktorture.c
> @@ -87,9 +87,9 @@ static struct lock_writer_stress_stats *lwsa;
> #else
> #define LOCKTORTURE_RUNNABLE_INIT 0
> #endif
> -int locktorture_runnable = LOCKTORTURE_RUNNABLE_INIT;
> -module_param(locktorture_runnable, int, 0444);
> -MODULE_PARM_DESC(locktorture_runnable, "Start locktorture at module init");
> +int torture_runnable = LOCKTORTURE_RUNNABLE_INIT;
> +module_param(torture_runnable, int, 0444);
> +MODULE_PARM_DESC(torture_runnable, "Start locktorture at module init");
>
> /* Forward reference. */
> static void lock_torture_cleanup(void);
> @@ -355,7 +355,7 @@ static int __init lock_torture_init(void)
> &lock_busted_ops, &spin_lock_ops, &spin_lock_irq_ops,
> };
>
> - if (!torture_init_begin(torture_type, verbose, &locktorture_runnable))
> + if (!torture_init_begin(torture_type, verbose, &torture_runnable))
> return -EBUSY;
>
> /* Process args and tell the world that the torturer is on the job. */
> --
> 1.8.4.5
locktorture: Make torture scripting account for new _runnable name
Signed-off-by: Paul E. McKenney <paul...@linux.vnet.ibm.com>
diff --git a/tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh
b/tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh
index 9746ea1cd6c7..252aae618984 100644
--- a/tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh
+++ b/tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh
@@ -38,6 +38,6 @@ per_version_boot_params () {
echo $1 `locktorture_param_onoff "$1" "$2"` \
locktorture.stat_interval=15 \
locktorture.shutdown_secs=$3 \
- locktorture.locktorture_runnable=1 \
+ locktorture.torture_runnable=1 \
locktorture.verbose=1
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
