From 0849741020a7169d7a831fbf7c60f16d9c0ad6d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Date: Tue, 16 Oct 2012 15:29:52 -0700 Subject: [PATCH] --- yaml --- r: 337107 b: refs/heads/master c: 89334ab4d389c008d291eb8682914c759851ee34 h: refs/heads/master i: 337105: 8b9e035a5b5b59a309dc810226f3e13f4126658f 337103: 1d6d4cec9bb42666355714854d5a0d9a34288a2a v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/binder.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e8e26861b2b1..10887dde3cb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 509f3f78c99e89c83714f0cad40ea09e18f21d03 +refs/heads/master: 89334ab4d389c008d291eb8682914c759851ee34 diff --git a/trunk/drivers/staging/android/binder.c b/trunk/drivers/staging/android/binder.c index 7b0ba92e7e46..9e852d0bef3b 100644 --- a/trunk/drivers/staging/android/binder.c +++ b/trunk/drivers/staging/android/binder.c @@ -2135,6 +2135,7 @@ static int binder_thread_read(struct binder_proc *proc, if (put_user(thread->return_error2, (uint32_t __user *)ptr)) return -EFAULT; ptr += sizeof(uint32_t); + binder_stat_br(proc, thread, thread->return_error2); if (ptr == end) goto done; thread->return_error2 = BR_OK; @@ -2142,6 +2143,7 @@ static int binder_thread_read(struct binder_proc *proc, if (put_user(thread->return_error, (uint32_t __user *)ptr)) return -EFAULT; ptr += sizeof(uint32_t); + binder_stat_br(proc, thread, thread->return_error); thread->return_error = BR_OK; goto done; } @@ -2297,6 +2299,7 @@ static int binder_thread_read(struct binder_proc *proc, if (put_user(death->cookie, (void * __user *)ptr)) return -EFAULT; ptr += sizeof(void *); + binder_stat_br(proc, thread, cmd); binder_debug(BINDER_DEBUG_DEATH_NOTIFICATION, "binder: %d:%d %s %p\n", proc->pid, thread->pid, @@ -2404,6 +2407,7 @@ static int binder_thread_read(struct binder_proc *proc, proc->pid, thread->pid); if (put_user(BR_SPAWN_LOOPER, (uint32_t __user *)buffer)) return -EFAULT; + binder_stat_br(proc, thread, BR_SPAWN_LOOPER); } return 0; }