Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 161937
b: refs/heads/master
c: fd0a2f0
h: refs/heads/master
i:
  161935: 5c7f5b6
v: v3
  • Loading branch information
Daniel Walker authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent f192607 commit a96c2a8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 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: 9980318e5405fe34a8f7e3af439647a729d10014
refs/heads/master: fd0a2f07d9b37fa52ece5bdec4f1130e080c1f51
8 changes: 5 additions & 3 deletions trunk/drivers/staging/android/binder.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ struct binder_buffer {
uint8_t data[0];
};

enum {
enum binder_deferred_state {
BINDER_DEFERRED_PUT_FILES = 0x01,
BINDER_DEFERRED_FLUSH = 0x02,
BINDER_DEFERRED_RELEASE = 0x04,
Expand Down Expand Up @@ -326,7 +326,8 @@ struct binder_transaction {
uid_t sender_euid;
};

static void binder_defer_work(struct binder_proc *proc, int defer);
static void
binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer);

/*
* copied from get_unused_fd_flags
Expand Down Expand Up @@ -3071,7 +3072,8 @@ static void binder_deferred_func(struct work_struct *work)
}
static DECLARE_WORK(binder_deferred_work, binder_deferred_func);

static void binder_defer_work(struct binder_proc *proc, int defer)
static void
binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer)
{
mutex_lock(&binder_deferred_lock);
proc->deferred_work |= defer;
Expand Down

0 comments on commit a96c2a8

Please sign in to comment.