Make include/linux/ conform to ZFS style standard

[mirror_spl.git] / include / linux / wait_compat.h

diff --git a/include/linux/wait_compat.h b/include/linux/wait_compat.h
index 66f9a9a613050a5ffd74921789c814c8d25db26d..10fe2d8960955654119e755c32b1e199224775af 100644 (file)
--- a/include/linux/wait_compat.h
+++ b/include/linux/wait_compat.h
@@ -1,4 +1,4 @@
-/*****************************************************************************\
+/*
  *  Copyright (C) 2007-2014 Lawrence Livermore National Security, LLC.
  *  Copyright (C) 2007 The Regents of the University of California.
  *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@@ -20,26 +20,36 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with the SPL.  If not, see <http://www.gnu.org/licenses/>.
-\*****************************************************************************/
+ */
 
 #ifndef _SPL_WAIT_COMPAT_H
-#define _SPL_WAIT_COMPAT_H
+#define        _SPL_WAIT_COMPAT_H
 
+#include <linux/sched.h>
+#include <linux/wait.h>
 
 #ifndef HAVE_WAIT_ON_BIT_ACTION
-#  define spl_wait_on_bit(word, bit, mode) wait_on_bit(word, bit, mode)
+#define        spl_wait_on_bit(word, bit, mode)        wait_on_bit(word, bit, mode)
 #else
 
 static inline int
 spl_bit_wait(void *word)
 {
-        schedule();
-        return 0;
+       schedule();
+       return (0);
 }
 
-#define spl_wait_on_bit(word, bit, mode)                       \
+#define        spl_wait_on_bit(word, bit, mode)                \
        wait_on_bit(word, bit, spl_bit_wait, mode)
 
 #endif /* HAVE_WAIT_ON_BIT_ACTION */
 
+#ifdef HAVE_WAIT_QUEUE_ENTRY_T
+typedef wait_queue_head_t      spl_wait_queue_head_t;
+typedef wait_queue_entry_t     spl_wait_queue_entry_t;
+#else
+typedef wait_queue_head_t      spl_wait_queue_head_t;
+typedef wait_queue_t           spl_wait_queue_entry_t;
+#endif
+
 #endif /* SPL_WAIT_COMPAT_H */