Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281206
b: refs/heads/master
c: 3c762a4
h: refs/heads/master
v: v3
  • Loading branch information
Arve Hjønnevåg authored and Greg Kroah-Hartman committed Nov 30, 2011
1 parent 899b774 commit 6b994b3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 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: 8bfe15f3de0af92fd822b7475878bddc93fa490d
refs/heads/master: 3c762a49b12073c96f6a55b4dfc8b6a2a45fedff
7 changes: 6 additions & 1 deletion trunk/drivers/staging/android/binder.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ static struct dentry *binder_debugfs_dir_entry_proc;
static struct binder_node *binder_context_mgr_node;
static uid_t binder_context_mgr_uid = -1;
static int binder_last_id;
static struct workqueue_struct *binder_deferred_workqueue;

#define BINDER_DEBUG_ENTRY(name) \
static int binder_##name##_open(struct inode *inode, struct file *file) \
Expand Down Expand Up @@ -3109,7 +3110,7 @@ binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer)
if (hlist_unhashed(&proc->deferred_work_node)) {
hlist_add_head(&proc->deferred_work_node,
&binder_deferred_list);
schedule_work(&binder_deferred_work);
queue_work(binder_deferred_workqueue, &binder_deferred_work);
}
mutex_unlock(&binder_deferred_lock);
}
Expand Down Expand Up @@ -3552,6 +3553,10 @@ static int __init binder_init(void)
{
int ret;

binder_deferred_workqueue = create_singlethread_workqueue("binder");
if (!binder_deferred_workqueue)
return -ENOMEM;

binder_debugfs_dir_entry_root = debugfs_create_dir("binder", NULL);
if (binder_debugfs_dir_entry_root)
binder_debugfs_dir_entry_proc = debugfs_create_dir("proc",
Expand Down

0 comments on commit 6b994b3

Please sign in to comment.