---

yaml --- r: 337107 b: refs/heads/master c: 89334ab h: refs/heads/master i: 337105: 8b9e035 337103: 1d6d4ce v: v3
git-mirror · Oct 22, 2012 · 0849741 · 0849741
1 parent f7dbe29
commit 0849741
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -2135,13 +2135,15 @@ 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;
 		}
 		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;
 }