svn commit: r314930 - head/sys/netinet

[Gleb Smirnoff]

Author: glebius
Date: Thu Mar  9 00:55:19 2017
New Revision: 314930
URL: https://svnweb.freebsd.org/changeset/base/314930

Log:
  Make inp_lock_assert() depend on INVARIANT_SUPPORT, not INVARIANTS.
  This will make INVARIANT-enabled modules, that use this function to load
  successfully on a kernel that has INVARIANT_SUPPORT only.

Modified:
  head/sys/netinet/in_pcb.c
  head/sys/netinet/in_pcb.h

Modified: head/sys/netinet/in_pcb.c
==============================================================================
--- head/sys/netinet/in_pcb.c	Thu Mar  9 00:45:15 2017	(r314929)
+++ head/sys/netinet/in_pcb.c	Thu Mar  9 00:55:19 2017	(r314930)
@@ -2348,7 +2348,7 @@ inp_runlock(struct inpcb *inp)
 	INP_RUNLOCK(inp);
 }
 
-#ifdef INVARIANTS
+#ifdef INVARIANT_SUPPORT
 void
 inp_lock_assert(struct inpcb *inp)
 {

Modified: head/sys/netinet/in_pcb.h
==============================================================================
--- head/sys/netinet/in_pcb.h	Thu Mar  9 00:45:15 2017	(r314929)
+++ head/sys/netinet/in_pcb.h	Thu Mar  9 00:55:19 2017	(r314930)
@@ -464,20 +464,12 @@ void inp_wunlock(struct inpcb *);
 void inp_rlock(struct inpcb *);
 void inp_runlock(struct inpcb *);
 
-#ifdef INVARIANTS
+#ifdef INVARIANT_SUPPORT
 void inp_lock_assert(struct inpcb *);
 void inp_unlock_assert(struct inpcb *);
 #else
-static __inline void
-inp_lock_assert(struct inpcb *inp __unused)
-{
-}
-
-static __inline void
-inp_unlock_assert(struct inpcb *inp __unused)
-{
-}
-
+#define	inp_lock_assert(inp)	do {} while (0)
+#define	inp_unlock_assert(inp)	do {} while (0)
 #endif
 
 void	inp_apply_all(void (*func)(struct inpcb *, void *), void *arg);