summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2013-07-30 10:13:41 +0200
committerIngo Molnar <mingo@kernel.org>2013-07-30 22:16:40 +0200
commit85f4896123d0299128f2c95cc40f3b8b01d4b0f6 (patch)
treecadd786200b218479e020386c4aa77cdd15688e5 /fs
parent36f571e9ed0419e73d127e18aa8992ced867268c (diff)
downloadlinux-85f4896123d0299128f2c95cc40f3b8b01d4b0f6.tar.gz
linux-85f4896123d0299128f2c95cc40f3b8b01d4b0f6.tar.bz2
linux-85f4896123d0299128f2c95cc40f3b8b01d4b0f6.zip
mutex: Fix w/w mutex deadlock injection
The check needs to be for > 1, because ctx->acquired is already incremented. This will prevent ww_mutex_lock_slow from returning -EDEADLK and not locking the mutex. It caused a lot of false gpu lockups on radeon with CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y because a function that shouldn't be able to return -EDEADLK did. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/51F775B5.201@canonical.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions