diff options
| author | tingyi_kuo <tingyi_kuo@asus.com> | 2015-04-28 14:27:11 +0800 |
|---|---|---|
| committer | Tom Chu <tom_chu@asus.com> | 2015-04-28 14:30:11 +0800 |
| commit | 52d6e325cfea47750c57a6bcc3f2676e37098d47 (patch) | |
| tree | 6d5cada29a07d66dbd4aee954014b8a7eb4724ea | |
| parent | db8cc7fb4c6631894b8d79fa8eafeb9619b7f9b3 (diff) | |
android:binder: 20647756: Change binder mutext to rtmutext.android-wear-5.1.1_r0.6
Change-Id: Iee736a40564c23d1057d74f7b886e88658cfe1db
Reviewed-on: http://mcrd1-22-pc.corpnet.asus/code-review/master/175207
Reviewed-by: Tingyi Kuo <tingyi_kuo@asus.com>
Tested-by: Tingyi Kuo <tingyi_kuo@asus.com>
Reviewed-by: Tom Chu <tom_chu@asus.com>
Tested-by: Tom Chu <tom_chu@asus.com>
| -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 5bf34ec6fc76..a2da88eff8ed 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -27,6 +27,7 @@ #include <linux/mm.h> #include <linux/module.h> #include <linux/mutex.h> +#include <linux/rtmutex.h> #include <linux/nsproxy.h> #include <linux/poll.h> #include <linux/debugfs.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) |