diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2014-12-05 12:06:44 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2014-12-05 12:06:44 +0530 |
| commit | 89732cd8a2cff9fcf6ca707126bf7a9a6b4618c2 (patch) | |
| tree | 35fc4d75e8b791c6930150493ca6588a275a50af /drivers/staging/android | |
| parent | 34fcdee4eaa7930045852e6dde2158d8b2cb1c98 (diff) | |
| parent | 4b77eee35fd243fff8df79dc80b905e91fd0fa42 (diff) | |
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/binder.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index d4e529001934..9c821f398cad 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -26,6 +26,7 @@ #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> @@ -42,7 +43,7 @@ #include "binder.h" #include "binder_trace.h" -static DEFINE_MUTEX(binder_main_lock); +static DEFINE_RT_MUTEX(binder_main_lock); static DEFINE_MUTEX(binder_deferred_lock); static DEFINE_MUTEX(binder_mmap_lock); @@ -420,14 +421,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); - mutex_lock(&binder_main_lock); + rt_mutex_lock(&binder_main_lock); trace_binder_locked(tag); } static inline void binder_unlock(const char *tag) { trace_binder_unlock(tag); - mutex_unlock(&binder_main_lock); + rt_mutex_unlock(&binder_main_lock); } static void binder_set_nice(long nice) |