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 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking fix from Ingo Molnar:
"An rtmutex deadlock path fixlet"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/rtmutex: Set state back to running on error

Linus Torvalds 2ea51b88 ae1aa797

+1
+1
kernel/locking/rtmutex.c
··· 1193 1193 ret = __rt_mutex_slowlock(lock, state, timeout, &waiter); 1194 1194 1195 1195 if (unlikely(ret)) { 1196 + __set_current_state(TASK_RUNNING); 1196 1197 if (rt_mutex_has_waiters(lock)) 1197 1198 remove_waiter(lock, &waiter); 1198 1199 rt_mutex_handle_deadlock(ret, chwalk, &waiter);