diff options
Diffstat (limited to 'include/linux/wait.h')
-rw-r--r-- | include/linux/wait.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h index 6fb1ba5f9b2f..80115bf88671 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h | |||
@@ -25,7 +25,7 @@ struct wait_bit_key { | |||
25 | void *flags; | 25 | void *flags; |
26 | int bit_nr; | 26 | int bit_nr; |
27 | #define WAIT_ATOMIC_T_BIT_NR -1 | 27 | #define WAIT_ATOMIC_T_BIT_NR -1 |
28 | unsigned long private; | 28 | unsigned long timeout; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | struct wait_bit_queue { | 31 | struct wait_bit_queue { |
@@ -154,6 +154,7 @@ int __wait_on_bit_lock(wait_queue_head_t *, struct wait_bit_queue *, wait_bit_ac | |||
154 | void wake_up_bit(void *, int); | 154 | void wake_up_bit(void *, int); |
155 | void wake_up_atomic_t(atomic_t *); | 155 | void wake_up_atomic_t(atomic_t *); |
156 | int out_of_line_wait_on_bit(void *, int, wait_bit_action_f *, unsigned); | 156 | int out_of_line_wait_on_bit(void *, int, wait_bit_action_f *, unsigned); |
157 | int out_of_line_wait_on_bit_timeout(void *, int, wait_bit_action_f *, unsigned, unsigned long); | ||
157 | int out_of_line_wait_on_bit_lock(void *, int, wait_bit_action_f *, unsigned); | 158 | int out_of_line_wait_on_bit_lock(void *, int, wait_bit_action_f *, unsigned); |
158 | int out_of_line_wait_on_atomic_t(atomic_t *, int (*)(atomic_t *), unsigned); | 159 | int out_of_line_wait_on_atomic_t(atomic_t *, int (*)(atomic_t *), unsigned); |
159 | wait_queue_head_t *bit_waitqueue(void *, int); | 160 | wait_queue_head_t *bit_waitqueue(void *, int); |
@@ -859,6 +860,8 @@ int wake_bit_function(wait_queue_t *wait, unsigned mode, int sync, void *key); | |||
859 | 860 | ||
860 | extern int bit_wait(struct wait_bit_key *); | 861 | extern int bit_wait(struct wait_bit_key *); |
861 | extern int bit_wait_io(struct wait_bit_key *); | 862 | extern int bit_wait_io(struct wait_bit_key *); |
863 | extern int bit_wait_timeout(struct wait_bit_key *); | ||
864 | extern int bit_wait_io_timeout(struct wait_bit_key *); | ||
862 | 865 | ||
863 | /** | 866 | /** |
864 | * wait_on_bit - wait for a bit to be cleared | 867 | * wait_on_bit - wait for a bit to be cleared |