tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull w/w mutex deadlock injection fix from Ingo Molnar.

This bug made the CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y option largely
useless, but wouldn't affect normal users.

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
mutex: Fix w/w mutex deadlock injection

Linus Torvalds 27822558 d4e4ab86

+2 -2
+2 -2
kernel/mutex.c
··· 686 686 might_sleep(); 687 687 ret = __mutex_lock_common(&lock->base, TASK_UNINTERRUPTIBLE, 688 688 0, &ctx->dep_map, _RET_IP_, ctx); 689 - if (!ret && ctx->acquired > 0) 689 + if (!ret && ctx->acquired > 1) 690 690 return ww_mutex_deadlock_injection(lock, ctx); 691 691 692 692 return ret; ··· 702 702 ret = __mutex_lock_common(&lock->base, TASK_INTERRUPTIBLE, 703 703 0, &ctx->dep_map, _RET_IP_, ctx); 704 704 705 - if (!ret && ctx->acquired > 0) 705 + if (!ret && ctx->acquired > 1) 706 706 return ww_mutex_deadlock_injection(lock, ctx); 707 707 708 708 return ret;