svn commit: r344837 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Wed Mar  6 02:51:33 2019
New Revision: 344837
URL: https://svnweb.freebsd.org/changeset/base/344837

Log:
  MFC r343705:
  
  new_kmem_alloc(9) is a Solaris/illumos malloc(9). FreeBSD and NetBSD
  never get here, however a test for SOLARIS, as redundant as this test is,
  serves to document that this is the illumos definition. This should help
  those who come after me to follow the code more easily.

Modified:
  stable/12/sys/contrib/ipfilter/netinet/ip_compat.h
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/contrib/ipfilter/netinet/ip_compat.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/contrib/ipfilter/netinet/ip_compat.h
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/ip_compat.h	Wed Mar  6 02:46:18 2019	(r344836)
+++ stable/12/sys/contrib/ipfilter/netinet/ip_compat.h	Wed Mar  6 02:51:33 2019	(r344837)
@@ -590,7 +590,7 @@ MALLOC_DECLARE(M_IPFILTER);
 #  define	COPYOUT(a,b,c)	(bcopy((caddr_t)(a), (caddr_t)(b), (c)), 0)
 # endif
 
-# ifndef KMALLOC
+# if SOLARIS && !defined(KMALLOC)
 #  define	KMALLOC(a,b)	(a) = (b)new_kmem_alloc(sizeof(*(a)), \
 							KMEM_NOSLEEP)
 #  define	KMALLOCS(a,b,c)	(a) = (b)new_kmem_alloc((c), KMEM_NOSLEEP)