locking fixes
Greg,
Please pull the latest locking-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-for-linus
# HEAD: e4a02ed2aaf447fa849e3254bfdb3b9b01e1e520 locking/ww_mutex: Fix runtime warning in the WW mutex selftest
A fix in the ww_mutex self-test that produces a scary splat, plus an updates to the maintained-filed patters in MAINTAINER.
Thanks,
Ingo
------------------>
Guenter Roeck (1):
locking/ww_mutex: Fix runtime warning in the WW mutex selftest
Will Deacon (1):
MAINTAINERS: Remove dead path from LOCKING PRIMITIVES entry
MAINTAINERS | 1 - kernel/locking/test-ww_mutex.c | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-)
MAINTAINERS +0 -1
@@ -8598,7 +8598,6 @@ F: include/linux/spinlock*.h F: arch/*/include/asm/spinlock*.h F: include/linux/rwlock*.h F: include/linux/mutex*.h -F: arch/*/include/asm/mutex*.h F: include/linux/rwsem*.h F: arch/*/include/asm/rwsem.h F: include/linux/seqlock.h
kernel/locking/test-ww_mutex.c +6 -4
@@ -260,7 +260,7 @@ static void test_cycle_work(struct work_struct *work) {struct test_cycle *cycle =container_of (work,typeof (*cycle), work);struct ww_acquire_ctx ctx; -int err; +int err, erra =0 ;ww_acquire_init (&ctx, &ww_class);ww_mutex_lock (&cycle->a_mutex, &ctx);
@@ -270,17 +270,19 @@ static void test_cycle_work(struct work_struct *work) err =ww_mutex_lock (cycle->b_mutex, &ctx);if (err == -EDEADLK ) { + err =0 ;ww_mutex_unlock (&cycle->a_mutex);ww_mutex_lock_slow (cycle->b_mutex, &ctx); - err =ww_mutex_lock (&cycle->a_mutex, &ctx); + erra =ww_mutex_lock (&cycle->a_mutex, &ctx); }if (!err)ww_mutex_unlock (cycle->b_mutex); -ww_mutex_unlock (&cycle->a_mutex); +if (!erra) +ww_mutex_unlock (&cycle->a_mutex);ww_acquire_fini (&ctx); - cycle->result = err; + cycle->result = err ?: erra; }static int __test_cycle (unsigned int nthreads)
Quoted 5 lines · Ingo Molnar
Greg,
Please pull the latest locking-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitlocking-urgent-for-linus
Now merged, thanks.
greg k-h