diff options
Diffstat (limited to 'include/linux/wait.h')
-rw-r--r-- | include/linux/wait.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h index 2db83349865b..d69ac4ecc88b 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h | |||
@@ -969,7 +969,7 @@ extern int bit_wait_io_timeout(struct wait_bit_key *); | |||
969 | * on that signal. | 969 | * on that signal. |
970 | */ | 970 | */ |
971 | static inline int | 971 | static inline int |
972 | wait_on_bit(void *word, int bit, unsigned mode) | 972 | wait_on_bit(unsigned long *word, int bit, unsigned mode) |
973 | { | 973 | { |
974 | might_sleep(); | 974 | might_sleep(); |
975 | if (!test_bit(bit, word)) | 975 | if (!test_bit(bit, word)) |
@@ -994,7 +994,7 @@ wait_on_bit(void *word, int bit, unsigned mode) | |||
994 | * on that signal. | 994 | * on that signal. |
995 | */ | 995 | */ |
996 | static inline int | 996 | static inline int |
997 | wait_on_bit_io(void *word, int bit, unsigned mode) | 997 | wait_on_bit_io(unsigned long *word, int bit, unsigned mode) |
998 | { | 998 | { |
999 | might_sleep(); | 999 | might_sleep(); |
1000 | if (!test_bit(bit, word)) | 1000 | if (!test_bit(bit, word)) |
@@ -1020,7 +1020,8 @@ wait_on_bit_io(void *word, int bit, unsigned mode) | |||
1020 | * received a signal and the mode permitted wakeup on that signal. | 1020 | * received a signal and the mode permitted wakeup on that signal. |
1021 | */ | 1021 | */ |
1022 | static inline int | 1022 | static inline int |
1023 | wait_on_bit_timeout(void *word, int bit, unsigned mode, unsigned long timeout) | 1023 | wait_on_bit_timeout(unsigned long *word, int bit, unsigned mode, |
1024 | unsigned long timeout) | ||
1024 | { | 1025 | { |
1025 | might_sleep(); | 1026 | might_sleep(); |
1026 | if (!test_bit(bit, word)) | 1027 | if (!test_bit(bit, word)) |
@@ -1047,7 +1048,8 @@ wait_on_bit_timeout(void *word, int bit, unsigned mode, unsigned long timeout) | |||
1047 | * on that signal. | 1048 | * on that signal. |
1048 | */ | 1049 | */ |
1049 | static inline int | 1050 | static inline int |
1050 | wait_on_bit_action(void *word, int bit, wait_bit_action_f *action, unsigned mode) | 1051 | wait_on_bit_action(unsigned long *word, int bit, wait_bit_action_f *action, |
1052 | unsigned mode) | ||
1051 | { | 1053 | { |
1052 | might_sleep(); | 1054 | might_sleep(); |
1053 | if (!test_bit(bit, word)) | 1055 | if (!test_bit(bit, word)) |
@@ -1075,7 +1077,7 @@ wait_on_bit_action(void *word, int bit, wait_bit_action_f *action, unsigned mode | |||
1075 | * the @mode allows that signal to wake the process. | 1077 | * the @mode allows that signal to wake the process. |
1076 | */ | 1078 | */ |
1077 | static inline int | 1079 | static inline int |
1078 | wait_on_bit_lock(void *word, int bit, unsigned mode) | 1080 | wait_on_bit_lock(unsigned long *word, int bit, unsigned mode) |
1079 | { | 1081 | { |
1080 | might_sleep(); | 1082 | might_sleep(); |
1081 | if (!test_and_set_bit(bit, word)) | 1083 | if (!test_and_set_bit(bit, word)) |
@@ -1099,7 +1101,7 @@ wait_on_bit_lock(void *word, int bit, unsigned mode) | |||
1099 | * the @mode allows that signal to wake the process. | 1101 | * the @mode allows that signal to wake the process. |
1100 | */ | 1102 | */ |
1101 | static inline int | 1103 | static inline int |
1102 | wait_on_bit_lock_io(void *word, int bit, unsigned mode) | 1104 | wait_on_bit_lock_io(unsigned long *word, int bit, unsigned mode) |
1103 | { | 1105 | { |
1104 | might_sleep(); | 1106 | might_sleep(); |
1105 | if (!test_and_set_bit(bit, word)) | 1107 | if (!test_and_set_bit(bit, word)) |
@@ -1125,7 +1127,8 @@ wait_on_bit_lock_io(void *word, int bit, unsigned mode) | |||
1125 | * the @mode allows that signal to wake the process. | 1127 | * the @mode allows that signal to wake the process. |
1126 | */ | 1128 | */ |
1127 | static inline int | 1129 | static inline int |
1128 | wait_on_bit_lock_action(void *word, int bit, wait_bit_action_f *action, unsigned mode) | 1130 | wait_on_bit_lock_action(unsigned long *word, int bit, wait_bit_action_f *action, |
1131 | unsigned mode) | ||
1129 | { | 1132 | { |
1130 | might_sleep(); | 1133 | might_sleep(); |
1131 | if (!test_and_set_bit(bit, word)) | 1134 | if (!test_and_set_bit(bit, word)) |