diff options
author | Riley Andrews <riandrews@google.com> | 2015-01-12 13:47:28 -0800 |
---|---|---|
committer | Riley Andrews <riandrews@google.com> | 2015-01-13 22:36:34 +0000 |
commit | d6c742effc964c65007167f42c06a7c2504b22a2 (patch) | |
tree | 9983e799efabd2764ec30cf683980a22d5668e0a /drivers/staging/android | |
parent | b4804ef90f54068bfefd6a6f8c687e7844912c1d (diff) |
Revert "staging: binder: Change binder mutex to rtmutex."
This reverts commit 5d03bd0fdd66d3472386864cf32b4b82dda8d1a5.
Diffstat (limited to 'drivers/staging/android')
-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 6e4497026b26..f3be98ef54ec 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); @@ -421,14 +420,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) |