From 2f7fe95e98d652ec3bb95a691063617ff7d1eca2 Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Sun, 5 Jul 2009 09:32:45 -0700 Subject: [PATCH] --- yaml --- r: 161943 b: refs/heads/master c: 10626434f473a7b4b0a21f427b301d3dd0db65a8 h: refs/heads/master i: 161941: 0c21c6074a68d032e9ee1f8e303338554d1351e6 161939: 8ff48893b9f073cb65e0291314aa304f4da97cba 161935: 5c7f5b6e50c229dc6708f0fda555f3ca35b1247d v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/binder.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 96f48f55f95a..37e00e3fd0c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 272bb3d8759448b2017aee149d226d7bf2d2bbb7 +refs/heads/master: 10626434f473a7b4b0a21f427b301d3dd0db65a8 diff --git a/trunk/drivers/staging/android/binder.c b/trunk/drivers/staging/android/binder.c index 7e15f6e14026..c6dc58eee400 100644 --- a/trunk/drivers/staging/android/binder.c +++ b/trunk/drivers/staging/android/binder.c @@ -785,8 +785,8 @@ static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc, if (is_async) { proc->free_async_space -= size + sizeof(struct binder_buffer); binder_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC, - "binder: %d: binder_alloc_buf size %zd " - "async free %zd\n", proc->pid, size, + "binder: %d: binder_alloc_buf size %zd " + "async free %zd\n", proc->pid, size, proc->free_async_space); } @@ -1146,7 +1146,7 @@ static void binder_delete_ref(struct binder_ref *ref) binder_debug(BINDER_DEBUG_DEAD_BINDER, "binder: %d delete ref %d desc %d " "has death notification\n", ref->proc->pid, - ref->debug_id, ref->desc); + ref->debug_id, ref->desc); list_del(&ref->death->work.entry); kfree(ref->death); binder_stats_deleted(BINDER_STAT_DEATH); @@ -2331,7 +2331,7 @@ static int binder_thread_read(struct binder_proc *proc, if (!weak && !strong) { binder_debug(BINDER_DEBUG_INTERNAL_REFS, "binder: %d:%d node %d u%p c%p deleted\n", - proc->pid, thread->pid, node->debug_id, + proc->pid, thread->pid, node->debug_id, node->ptr, node->cookie); rb_erase(&node->rb_node, &proc->nodes); kfree(node);