Merge tag 'md/4.2' of git://neil.brown.name/md

[karo-tx-linux.git] / include / linux / wait.h

diff --git a/include/linux/wait.h b/include/linux/wait.h
index db78c72049478533b56399019997a11908df157e..1e1bf9f963a947fc686125d0a2809ad63b8a13ed 100644 (file)
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -982,7 +982,7 @@ extern int bit_wait_io_timeout(struct wait_bit_key *);
  * on that signal.
  */
 static inline int
-wait_on_bit(void *word, int bit, unsigned mode)
+wait_on_bit(unsigned long *word, int bit, unsigned mode)
 {
        might_sleep();
        if (!test_bit(bit, word))
@@ -1007,7 +1007,7 @@ wait_on_bit(void *word, int bit, unsigned mode)
  * on that signal.
  */
 static inline int
-wait_on_bit_io(void *word, int bit, unsigned mode)
+wait_on_bit_io(unsigned long *word, int bit, unsigned mode)
 {
        might_sleep();
        if (!test_bit(bit, word))
@@ -1033,7 +1033,8 @@ wait_on_bit_io(void *word, int bit, unsigned mode)
  * received a signal and the mode permitted wakeup on that signal.
  */
 static inline int
-wait_on_bit_timeout(void *word, int bit, unsigned mode, unsigned long timeout)
+wait_on_bit_timeout(unsigned long *word, int bit, unsigned mode,
+                   unsigned long timeout)
 {
        might_sleep();
        if (!test_bit(bit, word))
@@ -1060,7 +1061,8 @@ wait_on_bit_timeout(void *word, int bit, unsigned mode, unsigned long timeout)
  * on that signal.
  */
 static inline int
-wait_on_bit_action(void *word, int bit, wait_bit_action_f *action, unsigned mode)
+wait_on_bit_action(unsigned long *word, int bit, wait_bit_action_f *action,
+                  unsigned mode)
 {
        might_sleep();
        if (!test_bit(bit, word))
@@ -1088,7 +1090,7 @@ wait_on_bit_action(void *word, int bit, wait_bit_action_f *action, unsigned mode
  * the @mode allows that signal to wake the process.
  */
 static inline int
-wait_on_bit_lock(void *word, int bit, unsigned mode)
+wait_on_bit_lock(unsigned long *word, int bit, unsigned mode)
 {
        might_sleep();
        if (!test_and_set_bit(bit, word))
@@ -1112,7 +1114,7 @@ wait_on_bit_lock(void *word, int bit, unsigned mode)
  * the @mode allows that signal to wake the process.
  */
 static inline int
-wait_on_bit_lock_io(void *word, int bit, unsigned mode)
+wait_on_bit_lock_io(unsigned long *word, int bit, unsigned mode)
 {
        might_sleep();
        if (!test_and_set_bit(bit, word))
@@ -1138,7 +1140,8 @@ wait_on_bit_lock_io(void *word, int bit, unsigned mode)
  * the @mode allows that signal to wake the process.
  */
 static inline int
-wait_on_bit_lock_action(void *word, int bit, wait_bit_action_f *action, unsigned mode)
+wait_on_bit_lock_action(unsigned long *word, int bit, wait_bit_action_f *action,
+                       unsigned mode)
 {
        might_sleep();
        if (!test_and_set_bit(bit, word))