Revert "staging: binder: Change binder mutex to rtmutex."
authorRiley Andrews <riandrews@google.com>
Mon, 12 Jan 2015 21:47:28 +0000 (13:47 -0800)
committerRiley Andrews <riandrews@google.com>
Tue, 13 Jan 2015 22:36:34 +0000 (22:36 +0000)
This reverts commit 5d03bd0fdd66d3472386864cf32b4b82dda8d1a5.

drivers/staging/android/binder.c

index 6e4497026b269a431a5eb2f0fa2a42934cf82ba8..f3be98ef54ecc4bf0e521de392d47d0da5ac0ddc 100644 (file)
@@ -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)