diff options
| author | Ingo Molnar | 2016-01-06 11:02:29 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2016-01-06 11:02:29 +0100 |
| commit | 567bee2803cb46caeb6011de5b738fde33dc3896 (patch) | |
| tree | 05bab01377bffa356bfbe06c4b6193b23b7c24ca /include/linux/wait.h | |
| parent | aa0b7ae06387d40a988ce16a189082dee6e570bc (diff) | |
| parent | 093e5840ae76f1082633503964d035f40ed0216d (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before merging new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/wait.h')
| -rw-r--r-- | include/linux/wait.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h index f3bac30587f7..d2f4ec7dba7c 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -175,7 +175,7 @@ __remove_wait_queue(wait_queue_head_t *head, wait_queue_t *old) list_del(&old->task_list); } -typedef int wait_bit_action_f(struct wait_bit_key *); +typedef int wait_bit_action_f(struct wait_bit_key *, int mode); void __wake_up(wait_queue_head_t *q, unsigned int mode, int nr, void *key); void __wake_up_locked_key(wait_queue_head_t *q, unsigned int mode, void *key); void __wake_up_sync_key(wait_queue_head_t *q, unsigned int mode, int nr, void *key); @@ -990,10 +990,10 @@ int wake_bit_function(wait_queue_t *wait, unsigned mode, int sync, void *key); } while (0) -extern int bit_wait(struct wait_bit_key *); -extern int bit_wait_io(struct wait_bit_key *); -extern int bit_wait_timeout(struct wait_bit_key *); -extern int bit_wait_io_timeout(struct wait_bit_key *); +extern int bit_wait(struct wait_bit_key *, int); +extern int bit_wait_io(struct wait_bit_key *, int); +extern int bit_wait_timeout(struct wait_bit_key *, int); +extern int bit_wait_io_timeout(struct wait_bit_key *, int); /** * wait_on_bit - wait for a bit to be cleared |