From 17bbf32e73920e148f4a5d3d5ffec8990fe501e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= Date: Thu, 21 May 2015 20:47:46 +0200 Subject: [PATCH] drm/linux: Improve the implementation of mutex_lock_interruptible() --- sys/dev/drm/include/linux/mutex.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/drm/include/linux/mutex.h b/sys/dev/drm/include/linux/mutex.h index 9fd986b61a..ebd05bad35 100644 --- a/sys/dev/drm/include/linux/mutex.h +++ b/sys/dev/drm/include/linux/mutex.h @@ -36,6 +36,13 @@ #define mutex_trylock(lock) lockmgr(lock, LK_EXCLUSIVE|LK_NOWAIT) -#define mutex_lock_interruptible(lock) lockmgr((lock), LK_EXCLUSIVE|LK_SLEEPFAIL) +static inline int +mutex_lock_interruptible(struct lock *lock) +{ + if (lockmgr(lock, LK_EXCLUSIVE|LK_SLEEPFAIL)) + return -EINTR; + + return 0; +} #endif /* _LINUX_MUTEX_H_ */ -- 2.41.0