diff options
| author | Riley Andrews <riandrews@google.com> | 2015-10-14 11:47:24 -0700 |
|---|---|---|
| committer | Riley Andrews <riandrews@google.com> | 2015-10-14 19:03:00 +0000 |
| commit | d018e6f70470ce01ab6275e423906dcc79f847e2 (patch) | |
| tree | 521b02142f774051f1b08adb7cd4ce20d173a595 | |
| parent | 43e0bfd3b4401ab8d0598f01c2536becbdb68630 (diff) | |
Revert "staging: binder: Change binder mutex to rtmutex."
This reverts commit 92ee040d9161e36196e676213222abc3b4d404e8.
This ends up doing more damage than good on most devices. Go back to
using a standard mutex.
| -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 710393a72a8a..02ce86ce088c 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -26,7 +26,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> @@ -43,7 +42,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); @@ -423,14 +422,14 @@ static long task_close_fd(struct binder_proc *proc, unsigned int fd) 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) |