Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a918e785 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "staging: binder: Change binder mutex to rtmutex.""

parents 99b3982b b9aef5c8

drivers/staging/android/binder.c

+3 −4
Original line number Diff line number Diff line
@@ -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)