svn commit: r289564 - head/sys/ofed/include/linux

[Hans Petter Selasky]

Author: hselasky
Date: Mon Oct 19 10:54:24 2015
New Revision: 289564
URL: https://svnweb.freebsd.org/changeset/base/289564

Log:
  Merge LinuxKPI changes from DragonflyBSD:
  - Added support for multiple new Linux functions.
  - Properly implement DEFINE_WAIT() and init_waitqueue_head() macros.
  - Removed FreeBSD specific __wait_queue_head structure definition.
  
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/ofed/include/linux/wait.h

Modified: head/sys/ofed/include/linux/wait.h
==============================================================================
--- head/sys/ofed/include/linux/wait.h	Mon Oct 19 10:49:15 2015	(r289563)
+++ head/sys/ofed/include/linux/wait.h	Mon Oct 19 10:54:24 2015	(r289564)
@@ -39,15 +39,18 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 
-struct __wait_queue_head {
+typedef struct {
+} wait_queue_t;
+
+typedef struct {
 	unsigned int	wchan;
-};
-typedef struct __wait_queue_head wait_queue_head_t;
+} wait_queue_head_t;
 
-#define	init_waitqueue_head(x)
+#define	init_waitqueue_head(x) \
+    do { } while (0)
 
 static inline void
-__wake_up(struct __wait_queue_head *q, int all)
+__wake_up(wait_queue_head_t *q, int all)
 {
 	int wakeup_swapper;
 	void *c;
@@ -108,6 +111,23 @@ do {									\
 	-_error;							\
 })
 
-#define	DEFINE_WAIT(x)
+static inline int
+waitqueue_active(wait_queue_head_t *q)
+{
+	return 0;	/* XXX: not really implemented */
+}
+
+#define DEFINE_WAIT(name)	\
+	wait_queue_t name = {}
+
+static inline void
+prepare_to_wait(wait_queue_head_t *q, wait_queue_t *wait, int state)
+{
+}
+
+static inline void
+finish_wait(wait_queue_head_t *q, wait_queue_t *wait)
+{
+}
 
 #endif	/* _LINUX_WAIT_H_ */