diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2016-10-03 03:53:04 -0500 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-10-29 01:33:58 +0200 |
| commit | 0e24f3291247cea524ea5cb865a8a01abe2f5d5b (patch) | |
| tree | 04e82df1a5272e839ef260ba8e459e34ee335140 /drivers/staging | |
| parent | c0f2657c392ae536044b9d37905a0dc24942c6f4 (diff) | |
| download | kernel_samsung_tuna-0e24f3291247cea524ea5cb865a8a01abe2f5d5b.zip kernel_samsung_tuna-0e24f3291247cea524ea5cb865a8a01abe2f5d5b.tar.gz kernel_samsung_tuna-0e24f3291247cea524ea5cb865a8a01abe2f5d5b.tar.bz2 | |
Revert "android: binder: Change binder mutex to rtmutex."
This reverts commit 909dd49098fb59f56506bec637f3d881e4927279.
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/android/binder.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index bf3ac70..50bb19b 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -23,7 +23,6 @@ #include <linux/miscdevice.h> #include <linux/mm.h> #include <linux/module.h> -#include <linux/rtmutex.h> #include <linux/mutex.h> #include <linux/nsproxy.h> #include <linux/poll.h> @@ -39,7 +38,7 @@ #include "binder.h" #include "binder_trace.h" -static DEFINE_RT_MUTEX(binder_main_lock); +static DEFINE_MUTEX(binder_main_lock); static DEFINE_MUTEX(binder_deferred_lock); static DEFINE_MUTEX(binder_mmap_lock); @@ -506,14 +505,14 @@ out_unlock: static inline void binder_lock(const char *tag) { trace_binder_lock(tag); - rt_mutex_lock(&binder_main_lock); + mutex_lock(&binder_main_lock); trace_binder_locked(tag); } static inline void binder_unlock(const char *tag) { trace_binder_unlock(tag); - rt_mutex_unlock(&binder_main_lock); + mutex_unlock(&binder_main_lock); } static void binder_set_nice(long nice) |