Index: head/sys/ofed/include/linux/wait.h
===================================================================
--- head/sys/ofed/include/linux/wait.h	(revision 289563)
+++ head/sys/ofed/include/linux/wait.h	(revision 289564)
@@ -1,113 +1,133 @@
 /*-
  * Copyright (c) 2010 Isilon Systems, Inc.
  * Copyright (c) 2010 iX Systems, Inc.
  * Copyright (c) 2010 Panasas, Inc.
  * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice unmodified, this list of conditions, and the following
  *    disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef	_LINUX_WAIT_H_
 #define	_LINUX_WAIT_H_
 
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 #include <linux/list.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sleepqueue.h>
 #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;
 
 	c = &q->wchan;
 	sleepq_lock(c);
 	if (all)
 		wakeup_swapper = sleepq_broadcast(c, SLEEPQ_SLEEP, 0, 0);
 	else
 		wakeup_swapper = sleepq_signal(c, SLEEPQ_SLEEP, 0, 0);
 	sleepq_release(c);
 	if (wakeup_swapper)
 		kick_proc0();
 }
 
 #define	wake_up(q)				__wake_up(q, 0)
 #define	wake_up_nr(q, nr)			__wake_up(q, 1)
 #define	wake_up_all(q)				__wake_up(q, 1)
 #define	wake_up_interruptible(q)		__wake_up(q, 0)
 #define	wake_up_interruptible_nr(q, nr)		__wake_up(q, 1)
 #define	wake_up_interruptible_all(q, nr)	__wake_up(q, 1)
 
 #define	wait_event(q, cond)						\
 do {									\
 	void *c = &(q).wchan;						\
 	if (!(cond)) {							\
 		for (;;) {						\
 			sleepq_lock(c);					\
 			if (cond) {					\
 				sleepq_release(c);			\
 				break;					\
 			}						\
 			sleepq_add(c, NULL, "completion", SLEEPQ_SLEEP, 0); \
 			sleepq_wait(c, 0);				\
 		}							\
 	}								\
 } while (0)
 
 #define	wait_event_interruptible(q, cond)				\
 ({									\
 	void *c = &(q).wchan;						\
 	int _error;							\
 									\
 	_error = 0;							\
 	if (!(cond)) {							\
 		for (; _error == 0;) {					\
 			sleepq_lock(c);					\
 			if (cond) {					\
 				sleepq_release(c);			\
 				break;					\
 			}						\
 			sleepq_add(c, NULL, "completion",		\
 			    SLEEPQ_SLEEP | SLEEPQ_INTERRUPTIBLE, 0);	\
 			if (sleepq_wait_sig(c, 0))			\
 				_error = -ERESTARTSYS;			\
 		}							\
 	}								\
 	-_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_ */