svn commit: r302349 - in head/sys: kern sys

[Gleb Smirnoff]

Author: glebius
Date: Tue Jul  5 18:34:34 2016
New Revision: 302349
URL: https://svnweb.freebsd.org/changeset/base/302349

Log:
  Compile in the kassert_panic() function with INVARIANT_SUPPORT
  option, not INVARIANTS.  The function is required if we want
  to load in a module that is compiled with INVARIANTS.
  
  Reviewed by:	jhb
  Approved by:	re (gjb)

Modified:
  head/sys/kern/kern_shutdown.c
  head/sys/sys/systm.h

Modified: head/sys/kern/kern_shutdown.c
==============================================================================
--- head/sys/kern/kern_shutdown.c	Tue Jul  5 18:02:17 2016	(r302348)
+++ head/sys/kern/kern_shutdown.c	Tue Jul  5 18:34:34 2016	(r302349)
@@ -556,7 +556,7 @@ shutdown_reset(void *junk, int howto)
 	/* NOTREACHED */ /* assuming reset worked */
 }
 
-#if defined(WITNESS) || defined(INVARIANTS)
+#if defined(WITNESS) || defined(INVARIANT_SUPPORT)
 static int kassert_warn_only = 0;
 #ifdef KDB
 static int kassert_do_kdb = 0;

Modified: head/sys/sys/systm.h
==============================================================================
--- head/sys/sys/systm.h	Tue Jul  5 18:02:17 2016	(r302348)
+++ head/sys/sys/systm.h	Tue Jul  5 18:34:34 2016	(r302349)
@@ -76,7 +76,7 @@ extern int vm_guest;		/* Running as virt
 enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV,
 		VM_GUEST_VMWARE, VM_LAST };
 
-#if defined(WITNESS) || defined(INVARIANTS)
+#if defined(WITNESS) || defined(INVARIANT_SUPPORT)
 void	kassert_panic(const char *fmt, ...)  __printflike(1, 2);
 #endif