diff options
| author | Andreas Blaesius <skate4life@gmx.de> | 2015-10-14 11:54:15 -0700 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2016-10-20 21:52:47 +0200 |
| commit | 4def53f8562c7792a39dfaeda2ec06393508bf28 (patch) | |
| tree | 17c7fcd7c464d87562199b9aad4c58e19ae604ed | |
| parent | 3a59be9dee1e2a24bbf88b810d0a42f80bd6bdf2 (diff) | |
| download | kernel_samsung_espresso10-4def53f8562c7792a39dfaeda2ec06393508bf28.zip kernel_samsung_espresso10-4def53f8562c7792a39dfaeda2ec06393508bf28.tar.gz kernel_samsung_espresso10-4def53f8562c7792a39dfaeda2ec06393508bf28.tar.bz2 | |
Revert "android: binder: Change binder mutex to rtmutex."
This reverts commit ac8dbad406299a083df3bf7ff19cd8dae493c88c.
This ends up doing more damage than good on most devices. Go back to
using a standard mutex.
Change-Id: I7ad224cd0ca0e3a6aa657711bfb71a75acde700b
| -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 49af655..414e4c6 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) |