Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 161943
b: refs/heads/master
c: 1062643
h: refs/heads/master
i:
  161941: 0c21c60
  161939: 8ff4889
  161935: 5c7f5b6
v: v3
  • Loading branch information
Daniel Walker authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 1a2339f commit 2f7fe95
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 272bb3d8759448b2017aee149d226d7bf2d2bbb7
refs/heads/master: 10626434f473a7b4b0a21f427b301d3dd0db65a8
8 changes: 4 additions & 4 deletions trunk/drivers/staging/android/binder.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 2f7fe95

Please sign in to comment.