diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-04-18 14:42:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-04-18 14:42:24 +0200 |
| commit | 94e4dcc75a47253c75084524e15735585cd220a1 (patch) | |
| tree | e2a3077eb4009982fea3708576bb5f163ea4a20c /kernel/locking | |
| parent | e53f31bffe1d552f496b674cd1733658a268e177 (diff) | |
| parent | 91df49e187c1a111e423fe0c3aec3472980385e4 (diff) | |
| download | linux-94e4dcc75a47253c75084524e15735585cd220a1.tar.bz2 | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU and LKMM commits from Paul E. McKenney:
- An LKMM commit adding support for synchronize_srcu_expedited()
- A couple of straggling RCU flavor consolidation updates
- Documentation updates.
- Miscellaneous fixes
- SRCU updates
- RCU CPU stall-warning updates
- Torture-test updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking')
| -rw-r--r-- | kernel/locking/locktorture.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index ad40a2617063..80a463d31a8d 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c @@ -829,7 +829,9 @@ static void lock_torture_cleanup(void) "End of test: SUCCESS"); kfree(cxt.lwsa); + cxt.lwsa = NULL; kfree(cxt.lrsa); + cxt.lrsa = NULL; end: torture_cleanup_end(); |