diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-04-11 14:31:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-04-11 14:31:43 +0200 |
| commit | 120b566d1df22a0a4543ac0e8aef875c49dd2c21 (patch) | |
| tree | b13547dadf5cd29cae5341629771192be8db4a28 /kernel/torture.c | |
| parent | e49d033bddf5b565044e2abe4241353959bc9120 (diff) | |
| parent | ab6ad3dbddaf09f7df2d830766a2fb68d6ad669f (diff) | |
| download | linux-next-120b566d1df22a0a4543ac0e8aef875c49dd2c21.tar.gz linux-next-120b566d1df22a0a4543ac0e8aef875c49dd2c21.zip | |
Merge branch 'for-mingo-rcu' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU changes from Paul E. McKenney:
- Bitmap support for "N" as alias for last bit
- kvfree_rcu updates
- mm_dump_obj() updates. (One of these is to mm, but was suggested by Andrew Morton.)
- RCU callback offloading update
- Polling RCU grace-period interfaces
- Realtime-related RCU updates
- Tasks-RCU updates
- Torture-test updates
- Torture-test scripting updates
- Miscellaneous fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/torture.c')
| -rw-r--r-- | kernel/torture.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/torture.c b/kernel/torture.c index 01e336f1e5b2..0a315c387bed 100644 --- a/kernel/torture.c +++ b/kernel/torture.c @@ -816,9 +816,9 @@ bool torture_init_begin(char *ttype, int v) { mutex_lock(&fullstop_mutex); if (torture_type != NULL) { - pr_alert("torture_init_begin: Refusing %s init: %s running.\n", - ttype, torture_type); - pr_alert("torture_init_begin: One torture test at a time!\n"); + pr_alert("%s: Refusing %s init: %s running.\n", + __func__, ttype, torture_type); + pr_alert("%s: One torture test at a time!\n", __func__); mutex_unlock(&fullstop_mutex); return false; } |