svn commit: r307728 - head/sys/dev/netmap

[Ed Maste]

Author: emaste
Date: Fri Oct 21 13:51:47 2016
New Revision: 307728
URL: https://svnweb.freebsd.org/changeset/base/307728

Log:
  netmap: fix kernel build on GCC-using architectures
  
  GCC produced a multiple declaration warning from the
  SYSCTL_DECL(_dev_netmap).

Modified:
  head/sys/dev/netmap/netmap_mem2.c

Modified: head/sys/dev/netmap/netmap_mem2.c
==============================================================================
--- head/sys/dev/netmap/netmap_mem2.c	Fri Oct 21 11:29:25 2016	(r307727)
+++ head/sys/dev/netmap/netmap_mem2.c	Fri Oct 21 13:51:47 2016	(r307728)
@@ -502,7 +502,6 @@ static const struct netmap_mem_d nm_blue
 
 #define DECLARE_SYSCTLS(id, name) \
 	SYSBEGIN(mem2_ ## name); \
-	SYSCTL_DECL(_dev_netmap); /* leave it here, easier for porting */ \
 	SYSCTL_INT(_dev_netmap, OID_AUTO, name##_size, \
 	    CTLFLAG_RW, &netmap_params[id].size, 0, "Requested size of netmap " STRINGIFY(name) "s"); \
 	SYSCTL_INT(_dev_netmap, OID_AUTO, name##_curr_size, \
@@ -519,6 +518,7 @@ static const struct netmap_mem_d nm_blue
 	    "Default number of private netmap " STRINGIFY(name) "s");	\
 	SYSEND
 
+SYSCTL_DECL(_dev_netmap);
 DECLARE_SYSCTLS(NETMAP_IF_POOL, if);
 DECLARE_SYSCTLS(NETMAP_RING_POOL, ring);
 DECLARE_SYSCTLS(NETMAP_BUF_POOL, buf);