[Midnightbsd-cvs] src [8932] trunk/sys: mark SYSCTL nodes static

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Sep 26 19:02:42 EDT 2016


Revision: 8932
          http://svnweb.midnightbsd.org/src/?rev=8932
Author:   laffer1
Date:     2016-09-26 19:02:42 -0400 (Mon, 26 Sep 2016)
Log Message:
-----------
mark SYSCTL nodes static

Modified Paths:
--------------
    trunk/sys/amd64/amd64/mp_machdep.c
    trunk/sys/amd64/amd64/pmap.c
    trunk/sys/amd64/linux32/linux32_sysvec.c
    trunk/sys/cam/ata/ata_da.c
    trunk/sys/cam/ata/ata_pmp.c
    trunk/sys/cam/scsi/scsi_cd.c
    trunk/sys/cam/scsi/scsi_da.c
    trunk/sys/compat/ia32/ia32_sysvec.c
    trunk/sys/compat/linux/linux_mib.c
    trunk/sys/dev/aac/aac.c
    trunk/sys/dev/an/if_an.c
    trunk/sys/dev/ata/ata-all.c
    trunk/sys/dev/atkbdc/psm.c
    trunk/sys/dev/bce/if_bce.c
    trunk/sys/dev/bge/if_bge.c
    trunk/sys/dev/bktr/bktr_os.c
    trunk/sys/dev/bxe/if_bxe.c
    trunk/sys/dev/cardbus/cardbus.c
    trunk/sys/dev/cs/if_cs.c
    trunk/sys/dev/dcons/dcons_os.c
    trunk/sys/dev/fb/vesa.c
    trunk/sys/dev/fdc/fdc.c
    trunk/sys/dev/firewire/fwmem.c
    trunk/sys/dev/firewire/if_fwe.c
    trunk/sys/dev/firewire/if_fwip.c
    trunk/sys/dev/firewire/sbp.c
    trunk/sys/dev/ipmi/ipmi.c
    trunk/sys/dev/kbd/kbd.c
    trunk/sys/dev/malo/if_malo_pci.c
    trunk/sys/dev/mmc/mmc.c
    trunk/sys/dev/mwl/mwlhal.c
    trunk/sys/dev/pccard/pccard.c
    trunk/sys/dev/pccbb/pccbb.c
    trunk/sys/dev/pccbb/pccbb_isa.c
    trunk/sys/dev/rndtest/rndtest.c
    trunk/sys/dev/rt/if_rt.c
    trunk/sys/dev/sdhci/sdhci.c
    trunk/sys/dev/sound/midi/midi.c
    trunk/sys/dev/sound/pci/maestro.c
    trunk/sys/dev/sound/usb/uaudio.c
    trunk/sys/dev/syscons/syscons.c
    trunk/sys/dev/ubsec/ubsec.c
    trunk/sys/dev/wi/if_wi.c
    trunk/sys/dev/xe/if_xe.c
    trunk/sys/dev/xen/balloon/balloon.c
    trunk/sys/fs/ext2fs/ext2_alloc.c
    trunk/sys/fs/pseudofs/pseudofs_vncache.c
    trunk/sys/geom/cache/g_cache.c
    trunk/sys/geom/concat/g_concat.c
    trunk/sys/geom/geom_disk.c
    trunk/sys/geom/journal/g_journal.c
    trunk/sys/geom/mirror/g_mirror.c
    trunk/sys/geom/mountver/g_mountver.c
    trunk/sys/geom/multipath/g_multipath.c
    trunk/sys/geom/nop/g_nop.c
    trunk/sys/geom/raid3/g_raid3.c
    trunk/sys/geom/sched/gs_rr.c
    trunk/sys/geom/shsec/g_shsec.c
    trunk/sys/geom/stripe/g_stripe.c
    trunk/sys/geom/vinum/geom_vinum.c
    trunk/sys/geom/virstor/g_virstor.c
    trunk/sys/geom/zero/g_zero.c
    trunk/sys/gnu/fs/xfs/FreeBSD/support/debug.c
    trunk/sys/i386/i386/mp_machdep.c
    trunk/sys/i386/i386/pmap.c
    trunk/sys/kern/kern_clock.c
    trunk/sys/kern/kern_et.c
    trunk/sys/kern/kern_jail.c
    trunk/sys/kern/kern_ktr.c
    trunk/sys/kern/kern_malloc.c
    trunk/sys/kern/kern_poll.c
    trunk/sys/kern/kern_shutdown.c
    trunk/sys/kern/kern_sig.c
    trunk/sys/kern/kern_thr.c
    trunk/sys/kern/kern_umtx.c
    trunk/sys/kern/sched_4bsd.c
    trunk/sys/kern/subr_devstat.c
    trunk/sys/kern/subr_kdb.c
    trunk/sys/kern/subr_lock.c
    trunk/sys/kern/subr_prof.c
    trunk/sys/kern/subr_rman.c
    trunk/sys/kern/subr_sleepqueue.c
    trunk/sys/kern/subr_smp.c
    trunk/sys/kern/subr_turnstile.c
    trunk/sys/kern/subr_witness.c
    trunk/sys/kern/uipc_mqueue.c
    trunk/sys/kern/uipc_usrreq.c
    trunk/sys/kern/vfs_cache.c
    trunk/sys/net/bpf.c
    trunk/sys/net/flowtable.c
    trunk/sys/net/if_bridge.c
    trunk/sys/net/if_enc.c
    trunk/sys/net/if_epair.c
    trunk/sys/net/if_gif.c
    trunk/sys/net/if_gre.c
    trunk/sys/net/if_lagg.c
    trunk/sys/net/if_mib.c
    trunk/sys/net/if_stf.c
    trunk/sys/net/if_tap.c
    trunk/sys/net/if_tun.c
    trunk/sys/net/if_vlan.c
    trunk/sys/net/netisr.c
    trunk/sys/net/raw_cb.c
    trunk/sys/net/rtsock.c
    trunk/sys/net80211/ieee80211_hwmp.c
    trunk/sys/net80211/ieee80211_mesh.c
    trunk/sys/netgraph/atm/ng_atm.c
    trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
    trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
    trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
    trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
    trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
    trunk/sys/netgraph/ng_socket.c
    trunk/sys/netinet/accf_http.c
    trunk/sys/netinet/if_ether.c
    trunk/sys/netinet/igmp.c
    trunk/sys/netinet/in_mcast.c
    trunk/sys/netinet/in_pcb.c
    trunk/sys/netinet/ip_divert.c
    trunk/sys/netinet/ip_mroute.c
    trunk/sys/netinet/libalias/alias_sctp.c
    trunk/sys/netinet/tcp_hostcache.c
    trunk/sys/netinet/tcp_reass.c
    trunk/sys/netinet/tcp_syncache.c
    trunk/sys/netinet6/in6_mcast.c
    trunk/sys/netinet6/in6_src.c
    trunk/sys/netinet6/ip6_mroute.c
    trunk/sys/netinet6/mld6.c
    trunk/sys/netipx/ipx_proto.c
    trunk/sys/netpfil/ipfw/ip_dn_io.c
    trunk/sys/nlm/nlm_prot_impl.c
    trunk/sys/security/audit/audit.c
    trunk/sys/security/mac_biba/mac_biba.c
    trunk/sys/security/mac_bsdextended/mac_bsdextended.c
    trunk/sys/security/mac_ifoff/mac_ifoff.c
    trunk/sys/security/mac_lomac/mac_lomac.c
    trunk/sys/security/mac_mls/mac_mls.c
    trunk/sys/security/mac_partition/mac_partition.c
    trunk/sys/security/mac_portacl/mac_portacl.c
    trunk/sys/security/mac_seeotheruids/mac_seeotheruids.c
    trunk/sys/security/mac_stub/mac_stub.c
    trunk/sys/security/mac_test/mac_test.c
    trunk/sys/ufs/ffs/ffs_softdep.c
    trunk/sys/vm/memguard.c
    trunk/sys/vm/redzone.c
    trunk/sys/vm/vm_object.c
    trunk/sys/x86/x86/busdma_machdep.c
    trunk/sys/x86/x86/io_apic.c
    trunk/sys/x86/x86/mca.c

Modified: trunk/sys/amd64/amd64/mp_machdep.c
===================================================================
--- trunk/sys/amd64/amd64/mp_machdep.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/amd64/amd64/mp_machdep.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -1046,7 +1046,7 @@
 u_int xhits_gbl[MAXCPU];
 u_int xhits_pg[MAXCPU];
 u_int xhits_rng[MAXCPU];
-SYSCTL_NODE(_debug, OID_AUTO, xhits, CTLFLAG_RW, 0, "");
+static SYSCTL_NODE(_debug, OID_AUTO, xhits, CTLFLAG_RW, 0, "");
 SYSCTL_OPAQUE(_debug_xhits, OID_AUTO, global, CTLFLAG_RW, &xhits_gbl,
     sizeof(xhits_gbl), "IU", "");
 SYSCTL_OPAQUE(_debug_xhits, OID_AUTO, page, CTLFLAG_RW, &xhits_pg,

Modified: trunk/sys/amd64/amd64/pmap.c
===================================================================
--- trunk/sys/amd64/amd64/pmap.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/amd64/amd64/pmap.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -214,7 +214,7 @@
 vm_offset_t kernel_vm_end = VM_MIN_KERNEL_ADDRESS;
 pt_entry_t pg_nx;
 
-SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
+static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
 
 static int pat_works = 1;
 SYSCTL_INT(_vm_pmap, OID_AUTO, pat_works, CTLFLAG_RD, &pat_works, 1,
@@ -839,7 +839,7 @@
 		TAILQ_INIT(&pv_table[i].pv_list);
 }
 
-SYSCTL_NODE(_vm_pmap, OID_AUTO, pde, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_vm_pmap, OID_AUTO, pde, CTLFLAG_RD, 0,
     "2MB page mapping counters");
 
 static u_long pmap_pde_demotions;
@@ -858,7 +858,7 @@
 SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, promotions, CTLFLAG_RD,
     &pmap_pde_promotions, 0, "2MB page promotions");
 
-SYSCTL_NODE(_vm_pmap, OID_AUTO, pdpe, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_vm_pmap, OID_AUTO, pdpe, CTLFLAG_RD, 0,
     "1GB page mapping counters");
 
 static u_long pmap_pdpe_demotions;

Modified: trunk/sys/amd64/linux32/linux32_sysvec.c
===================================================================
--- trunk/sys/amd64/linux32/linux32_sysvec.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/amd64/linux32/linux32_sysvec.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -979,7 +979,7 @@
 	return ((register_t *)stack_base);
 }
 
-SYSCTL_NODE(_compat, OID_AUTO, linux32, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_compat, OID_AUTO, linux32, CTLFLAG_RW, 0,
     "32-bit Linux emulation");
 
 static u_long	linux32_maxdsiz = LINUX32_MAXDSIZ;

Modified: trunk/sys/cam/ata/ata_da.c
===================================================================
--- trunk/sys/cam/ata/ata_da.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/cam/ata/ata_da.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -613,7 +613,7 @@
 static int ada_read_ahead = ADA_DEFAULT_READ_AHEAD;
 static int ada_write_cache = ADA_DEFAULT_WRITE_CACHE;
 
-SYSCTL_NODE(_kern_cam, OID_AUTO, ada, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_kern_cam, OID_AUTO, ada, CTLFLAG_RD, 0,
             "CAM Direct Access Disk driver");
 SYSCTL_INT(_kern_cam_ada, OID_AUTO, legacy_aliases, CTLFLAG_RW,
            &ada_legacy_aliases, 0, "Create legacy-like device aliases");

Modified: trunk/sys/cam/ata/ata_pmp.c
===================================================================
--- trunk/sys/cam/ata/ata_pmp.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/cam/ata/ata_pmp.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -134,7 +134,7 @@
 static int pmp_default_timeout = PMP_DEFAULT_TIMEOUT;
 static int pmp_hide_special = PMP_DEFAULT_HIDE_SPECIAL;
 
-SYSCTL_NODE(_kern_cam, OID_AUTO, pmp, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_kern_cam, OID_AUTO, pmp, CTLFLAG_RD, 0,
             "CAM Direct Access Disk driver");
 SYSCTL_INT(_kern_cam_pmp, OID_AUTO, retry_count, CTLFLAG_RW,
            &pmp_retry_count, 0, "Normal I/O retry count");

Modified: trunk/sys/cam/scsi/scsi_cd.c
===================================================================
--- trunk/sys/cam/scsi/scsi_cd.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/cam/scsi/scsi_cd.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -304,8 +304,9 @@
 static int changer_min_busy_seconds = CHANGER_MIN_BUSY_SECONDS;
 static int changer_max_busy_seconds = CHANGER_MAX_BUSY_SECONDS;
 
-SYSCTL_NODE(_kern_cam, OID_AUTO, cd, CTLFLAG_RD, 0, "CAM CDROM driver");
-SYSCTL_NODE(_kern_cam_cd, OID_AUTO, changer, CTLFLAG_RD, 0, "CD Changer");
+static SYSCTL_NODE(_kern_cam, OID_AUTO, cd, CTLFLAG_RD, 0, "CAM CDROM driver");
+static SYSCTL_NODE(_kern_cam_cd, OID_AUTO, changer, CTLFLAG_RD, 0,
+    "CD Changer");
 SYSCTL_INT(_kern_cam_cd, OID_AUTO, retry_count, CTLFLAG_RW,
            &cd_retry_count, 0, "Normal I/O retry count");
 TUNABLE_INT("kern.cam.cd.retry_count", &cd_retry_count);

Modified: trunk/sys/cam/scsi/scsi_da.c
===================================================================
--- trunk/sys/cam/scsi/scsi_da.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/cam/scsi/scsi_da.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -892,7 +892,7 @@
 static int da_default_timeout = DA_DEFAULT_TIMEOUT;
 static int da_send_ordered = DA_DEFAULT_SEND_ORDERED;
 
-SYSCTL_NODE(_kern_cam, OID_AUTO, da, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_kern_cam, OID_AUTO, da, CTLFLAG_RD, 0,
             "CAM Direct Access Disk driver");
 SYSCTL_INT(_kern_cam_da, OID_AUTO, retry_count, CTLFLAG_RW,
            &da_retry_count, 0, "Normal I/O retry count");

Modified: trunk/sys/compat/ia32/ia32_sysvec.c
===================================================================
--- trunk/sys/compat/ia32/ia32_sysvec.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/compat/ia32/ia32_sysvec.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -95,7 +95,7 @@
 
 extern const char *freebsd32_syscallnames[];
 
-SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode");
+static SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode");
 
 static u_long	ia32_maxdsiz = IA32_MAXDSIZ;
 SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, "");

Modified: trunk/sys/compat/linux/linux_mib.c
===================================================================
--- trunk/sys/compat/linux/linux_mib.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/compat/linux/linux_mib.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -136,7 +136,7 @@
 
 static unsigned linux_osd_jail_slot;
 
-SYSCTL_NODE(_compat, OID_AUTO, linux, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_compat, OID_AUTO, linux, CTLFLAG_RW, 0,
 	    "Linux mode");
 
 static int	linux_set_osname(struct thread *td, char *osname);

Modified: trunk/sys/dev/aac/aac.c
===================================================================
--- trunk/sys/dev/aac/aac.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/aac/aac.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -222,7 +222,7 @@
 MALLOC_DEFINE(M_AACBUF, "aacbuf", "Buffers for the AAC driver");
 
 /* sysctl node */
-SYSCTL_NODE(_hw, OID_AUTO, aac, CTLFLAG_RD, 0, "AAC driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, aac, CTLFLAG_RD, 0, "AAC driver parameters");
 
 /*
  * Device Interface

Modified: trunk/sys/dev/an/if_an.c
===================================================================
--- trunk/sys/dev/an/if_an.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/an/if_an.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -204,7 +204,8 @@
 
 /* sysctl vars */
 
-SYSCTL_NODE(_hw, OID_AUTO, an, CTLFLAG_RD, 0, "Wireless driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, an, CTLFLAG_RD, 0,
+    "Wireless driver parameters");
 
 /* XXX violate ethernet/netgraph callback hooks */
 extern	void	(*ng_ether_attach_p)(struct ifnet *ifp);

Modified: trunk/sys/dev/ata/ata-all.c
===================================================================
--- trunk/sys/dev/ata/ata-all.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/ata/ata-all.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -111,7 +111,7 @@
 #endif
 
 /* sysctl vars */
-SYSCTL_NODE(_hw, OID_AUTO, ata, CTLFLAG_RD, 0, "ATA driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, ata, CTLFLAG_RD, 0, "ATA driver parameters");
 #ifndef ATA_CAM
 TUNABLE_INT("hw.ata.ata_dma", &ata_dma);
 SYSCTL_INT(_hw_ata, OID_AUTO, ata_dma, CTLFLAG_RDTUN, &ata_dma, 0,

Modified: trunk/sys/dev/atkbdc/psm.c
===================================================================
--- trunk/sys/dev/atkbdc/psm.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/atkbdc/psm.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -2265,8 +2265,8 @@
 }
 
 /* Add all sysctls under the debug.psm and hw.psm nodes */
-SYSCTL_NODE(_debug, OID_AUTO, psm, CTLFLAG_RD, 0, "ps/2 mouse");
-SYSCTL_NODE(_hw, OID_AUTO, psm, CTLFLAG_RD, 0, "ps/2 mouse");
+static SYSCTL_NODE(_debug, OID_AUTO, psm, CTLFLAG_RD, 0, "ps/2 mouse");
+static SYSCTL_NODE(_hw, OID_AUTO, psm, CTLFLAG_RD, 0, "ps/2 mouse");
 
 SYSCTL_INT(_debug_psm, OID_AUTO, loglevel, CTLFLAG_RW, &verbose, 0,
     "Verbosity level");

Modified: trunk/sys/dev/bce/if_bce.c
===================================================================
--- trunk/sys/dev/bce/if_bce.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/bce/if_bce.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -488,7 +488,7 @@
 /****************************************************************************/
 /* Tunable device values                                                    */
 /****************************************************************************/
-SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters");
 
 /* Allowable values are TRUE or FALSE */
 static int bce_verbose = TRUE;

Modified: trunk/sys/dev/bge/if_bge.c
===================================================================
--- trunk/sys/dev/bge/if_bge.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/bge/if_bge.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -532,7 +532,7 @@
 
 TUNABLE_INT("hw.bge.allow_asf", &bge_allow_asf);
 
-SYSCTL_NODE(_hw, OID_AUTO, bge, CTLFLAG_RD, 0, "BGE driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, bge, CTLFLAG_RD, 0, "BGE driver parameters");
 SYSCTL_INT(_hw_bge, OID_AUTO, allow_asf, CTLFLAG_RD, &bge_allow_asf, 0,
 	"Allow ASF mode if available");
 

Modified: trunk/sys/dev/bktr/bktr_os.c
===================================================================
--- trunk/sys/dev/bktr/bktr_os.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/bktr/bktr_os.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -108,7 +108,7 @@
 int bt848_dolby = 0;
 #endif
 
-SYSCTL_NODE(_hw, OID_AUTO, bt848, CTLFLAG_RW, 0, "Bt848 Driver mgmt");
+static SYSCTL_NODE(_hw, OID_AUTO, bt848, CTLFLAG_RW, 0, "Bt848 Driver mgmt");
 SYSCTL_INT(_hw_bt848, OID_AUTO, card, CTLFLAG_RW, &bt848_card, -1, "");
 SYSCTL_INT(_hw_bt848, OID_AUTO, tuner, CTLFLAG_RW, &bt848_tuner, -1, "");
 SYSCTL_INT(_hw_bt848, OID_AUTO, reverse_mute, CTLFLAG_RW, &bt848_reverse_mute, -1, "");

Modified: trunk/sys/dev/bxe/if_bxe.c
===================================================================
--- trunk/sys/dev/bxe/if_bxe.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/bxe/if_bxe.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -419,7 +419,7 @@
 /*
  * Tunable device values
  */
-SYSCTL_NODE(_hw, OID_AUTO, bxe, CTLFLAG_RD, 0, "bxe driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, bxe, CTLFLAG_RD, 0, "bxe driver parameters");
 /* Allowable values are TRUE (1) or FALSE (0). */
 
 static int bxe_dcc_enable = FALSE;

Modified: trunk/sys/dev/cardbus/cardbus.c
===================================================================
--- trunk/sys/dev/cardbus/cardbus.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/cardbus/cardbus.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -54,7 +54,7 @@
 #include "pcib_if.h"
 
 /* sysctl vars */
-SYSCTL_NODE(_hw, OID_AUTO, cardbus, CTLFLAG_RD, 0, "CardBus parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, cardbus, CTLFLAG_RD, 0, "CardBus parameters");
 
 int    cardbus_debug = 0;
 TUNABLE_INT("hw.cardbus.debug", &cardbus_debug);

Modified: trunk/sys/dev/cs/if_cs.c
===================================================================
--- trunk/sys/dev/cs/if_cs.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/cs/if_cs.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -104,7 +104,7 @@
 driver_intr_t	csintr;
 
 /* sysctl vars */
-SYSCTL_NODE(_hw, OID_AUTO, cs, CTLFLAG_RD, 0, "cs device parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, cs, CTLFLAG_RD, 0, "cs device parameters");
 
 int	cs_ignore_cksum_failure = 0;
 TUNABLE_INT("hw.cs.ignore_checksum_failure", &cs_ignore_cksum_failure);

Modified: trunk/sys/dev/dcons/dcons_os.c
===================================================================
--- trunk/sys/dev/dcons/dcons_os.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/dcons/dcons_os.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -93,7 +93,7 @@
 
 static struct dcons_softc sc[DCONS_NPORT];
 
-SYSCTL_NODE(_kern, OID_AUTO, dcons, CTLFLAG_RD, 0, "Dumb Console");
+static SYSCTL_NODE(_kern, OID_AUTO, dcons, CTLFLAG_RD, 0, "Dumb Console");
 SYSCTL_INT(_kern_dcons, OID_AUTO, poll_hz, CTLFLAG_RW, &poll_hz, 0,
 				"dcons polling rate");
 

Modified: trunk/sys/dev/fb/vesa.c
===================================================================
--- trunk/sys/dev/fb/vesa.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/fb/vesa.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -98,7 +98,7 @@
 /* VESA video adapter */
 static video_adapter_t *vesa_adp;
 
-SYSCTL_NODE(_debug, OID_AUTO, vesa, CTLFLAG_RD, NULL, "VESA debugging");
+static SYSCTL_NODE(_debug, OID_AUTO, vesa, CTLFLAG_RD, NULL, "VESA debugging");
 static int vesa_shadow_rom;
 TUNABLE_INT("debug.vesa.shadow_rom", &vesa_shadow_rom);
 SYSCTL_INT(_debug_vesa, OID_AUTO, shadow_rom, CTLFLAG_RDTUN, &vesa_shadow_rom,

Modified: trunk/sys/dev/fdc/fdc.c
===================================================================
--- trunk/sys/dev/fdc/fdc.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/fdc/fdc.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -267,7 +267,7 @@
 static void fdc_reset(struct fdc_data *);
 static int fd_probe_disk(struct fd_data *, int *);
 
-SYSCTL_NODE(_debug, OID_AUTO, fdc, CTLFLAG_RW, 0, "fdc driver");
+static SYSCTL_NODE(_debug, OID_AUTO, fdc, CTLFLAG_RW, 0, "fdc driver");
 
 static int fifo_threshold = 8;
 SYSCTL_INT(_debug_fdc, OID_AUTO, fifo, CTLFLAG_RW, &fifo_threshold, 0,

Modified: trunk/sys/dev/firewire/fwmem.c
===================================================================
--- trunk/sys/dev/firewire/fwmem.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/firewire/fwmem.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -73,7 +73,7 @@
 static int fwmem_speed=2, fwmem_debug=0;
 static struct fw_eui64 fwmem_eui64;
 SYSCTL_DECL(_hw_firewire);
-SYSCTL_NODE(_hw_firewire, OID_AUTO, fwmem, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_hw_firewire, OID_AUTO, fwmem, CTLFLAG_RD, 0,
 	"FireWire Memory Access");
 SYSCTL_UINT(_hw_firewire_fwmem, OID_AUTO, eui64_hi, CTLFLAG_RW,
 	&fwmem_eui64.hi, 0, "Fwmem target EUI64 high");

Modified: trunk/sys/dev/firewire/if_fwe.c
===================================================================
--- trunk/sys/dev/firewire/if_fwe.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/firewire/if_fwe.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -89,7 +89,7 @@
 MALLOC_DEFINE(M_FWE, "if_fwe", "Ethernet over FireWire interface");
 SYSCTL_INT(_debug, OID_AUTO, if_fwe_debug, CTLFLAG_RW, &fwedebug, 0, "");
 SYSCTL_DECL(_hw_firewire);
-SYSCTL_NODE(_hw_firewire, OID_AUTO, fwe, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_hw_firewire, OID_AUTO, fwe, CTLFLAG_RD, 0,
 	"Ethernet emulation subsystem");
 SYSCTL_INT(_hw_firewire_fwe, OID_AUTO, stream_ch, CTLFLAG_RW, &stream_ch, 0,
 	"Stream channel to use");

Modified: trunk/sys/dev/firewire/if_fwip.c
===================================================================
--- trunk/sys/dev/firewire/if_fwip.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/firewire/if_fwip.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -102,7 +102,7 @@
 MALLOC_DEFINE(M_FWIP, "if_fwip", "IP over FireWire interface");
 SYSCTL_INT(_debug, OID_AUTO, if_fwip_debug, CTLFLAG_RW, &fwipdebug, 0, "");
 SYSCTL_DECL(_hw_firewire);
-SYSCTL_NODE(_hw_firewire, OID_AUTO, fwip, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_hw_firewire, OID_AUTO, fwip, CTLFLAG_RD, 0,
 	"Firewire ip subsystem");
 SYSCTL_INT(_hw_firewire_fwip, OID_AUTO, rx_queue_len, CTLFLAG_RW, &rx_queue_len,
 	0, "Length of the receive queue");

Modified: trunk/sys/dev/firewire/sbp.c
===================================================================
--- trunk/sys/dev/firewire/sbp.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/firewire/sbp.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -132,7 +132,8 @@
 static int sbp_tags = 0;
 
 SYSCTL_DECL(_hw_firewire);
-SYSCTL_NODE(_hw_firewire, OID_AUTO, sbp, CTLFLAG_RD, 0, "SBP-II Subsystem");
+static SYSCTL_NODE(_hw_firewire, OID_AUTO, sbp, CTLFLAG_RD, 0,
+	"SBP-II Subsystem");
 SYSCTL_INT(_debug, OID_AUTO, sbp_debug, CTLFLAG_RW, &debug, 0,
 	"SBP debug flag");
 SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, auto_login, CTLFLAG_RW, &auto_login, 0,

Modified: trunk/sys/dev/ipmi/ipmi.c
===================================================================
--- trunk/sys/dev/ipmi/ipmi.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/ipmi/ipmi.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -63,7 +63,8 @@
 int ipmi_attached = 0;
 
 static int on = 1;
-SYSCTL_NODE(_hw, OID_AUTO, ipmi, CTLFLAG_RD, 0, "IPMI driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, ipmi, CTLFLAG_RD, 0,
+    "IPMI driver parameters");
 SYSCTL_INT(_hw_ipmi, OID_AUTO, on, CTLFLAG_RW,
 	&on, 0, "");
 

Modified: trunk/sys/dev/kbd/kbd.c
===================================================================
--- trunk/sys/dev/kbd/kbd.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/kbd/kbd.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -81,7 +81,7 @@
        keyboard_switch_t **kbdsw = &kbdsw_ini;
 
 static int keymap_restrict_change;
-SYSCTL_NODE(_hw, OID_AUTO, kbd, CTLFLAG_RD, 0, "kbd");
+static SYSCTL_NODE(_hw, OID_AUTO, kbd, CTLFLAG_RD, 0, "kbd");
 SYSCTL_INT(_hw_kbd, OID_AUTO, keymap_restrict_change, CTLFLAG_RW,
     &keymap_restrict_change, 0, "restrict ability to change keymap");
 

Modified: trunk/sys/dev/malo/if_malo_pci.c
===================================================================
--- trunk/sys/dev/malo/if_malo_pci.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/malo/if_malo_pci.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -79,7 +79,7 @@
  * Tunable variables.
  */
 SYSCTL_DECL(_hw_malo);
-SYSCTL_NODE(_hw_malo, OID_AUTO, pci, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_hw_malo, OID_AUTO, pci, CTLFLAG_RD, 0,
     "Marvell 88W8335 driver PCI parameters");
 
 static int msi_disable = 0;				/* MSI disabled  */

Modified: trunk/sys/dev/mmc/mmc.c
===================================================================
--- trunk/sys/dev/mmc/mmc.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/mmc/mmc.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -106,7 +106,7 @@
 
 #define CMD_RETRIES	3
 
-SYSCTL_NODE(_hw, OID_AUTO, mmc, CTLFLAG_RD, NULL, "mmc driver");
+static SYSCTL_NODE(_hw, OID_AUTO, mmc, CTLFLAG_RD, NULL, "mmc driver");
 
 static int mmc_debug;
 SYSCTL_INT(_hw_mmc, OID_AUTO, debug, CTLFLAG_RW, &mmc_debug, 0, "Debug level");

Modified: trunk/sys/dev/mwl/mwlhal.c
===================================================================
--- trunk/sys/dev/mwl/mwlhal.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/mwl/mwlhal.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -190,7 +190,8 @@
 #endif /* MWLHAL_DEBUG */
 
 SYSCTL_DECL(_hw_mwl);
-SYSCTL_NODE(_hw_mwl, OID_AUTO, hal, CTLFLAG_RD, 0, "Marvell HAL parameters");
+static SYSCTL_NODE(_hw_mwl, OID_AUTO, hal, CTLFLAG_RD, 0,
+    "Marvell HAL parameters");
 
 static __inline void
 MWL_HAL_LOCK(struct mwl_hal_priv *mh)

Modified: trunk/sys/dev/pccard/pccard.c
===================================================================
--- trunk/sys/dev/pccard/pccard.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/pccard/pccard.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -59,7 +59,7 @@
 #define PCCARDDEBUG
 
 /* sysctl vars */
-SYSCTL_NODE(_hw, OID_AUTO, pccard, CTLFLAG_RD, 0, "PCCARD parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, pccard, CTLFLAG_RD, 0, "PCCARD parameters");
 
 int	pccard_debug = 0;
 TUNABLE_INT("hw.pccard.debug", &pccard_debug);

Modified: trunk/sys/dev/pccbb/pccbb.c
===================================================================
--- trunk/sys/dev/pccbb/pccbb.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/pccbb/pccbb.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/dev/pccbb/pccbb.c,v 1.2 2008/12/02 02:47:53 laffer1 Exp $ */
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2004 M. Warner Losh.
  * Copyright (c) 2000-2001 Jonathan Chen.
@@ -130,7 +130,7 @@
 devclass_t cbb_devclass;
 
 /* sysctl vars */
-SYSCTL_NODE(_hw, OID_AUTO, cbb, CTLFLAG_RD, 0, "CBB parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, cbb, CTLFLAG_RD, 0, "CBB parameters");
 
 /* There's no way to say TUNEABLE_LONG to get the right types */
 u_long cbb_start_mem = CBB_START_MEM;

Modified: trunk/sys/dev/pccbb/pccbb_isa.c
===================================================================
--- trunk/sys/dev/pccbb/pccbb_isa.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/pccbb/pccbb_isa.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/dev/pccbb/pccbb_isa.c,v 1.2 2008/12/02 02:47:53 laffer1 Exp $ */
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002-2004 M. Warner Losh.
  * All rights reserved.
@@ -69,7 +69,7 @@
  *****************************************************************************/
 
 /* sysctl vars */
-SYSCTL_NODE(_hw, OID_AUTO, pcic, CTLFLAG_RD, 0, "PCIC parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, pcic, CTLFLAG_RD, 0, "PCIC parameters");
 
 static int isa_intr_mask = EXCA_INT_MASK_ALLOWED;
 TUNABLE_INT("hw.cbb.intr_mask", &isa_intr_mask);

Modified: trunk/sys/dev/rndtest/rndtest.c
===================================================================
--- trunk/sys/dev/rndtest/rndtest.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/rndtest/rndtest.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -70,8 +70,8 @@
 
 #define	RNDTEST_NTESTS	(sizeof(rndtest_funcs)/sizeof(rndtest_funcs[0]))
 
-SYSCTL_NODE(_kern, OID_AUTO, rndtest, CTLFLAG_RD, 0, "RNG test parameters");
-
+static SYSCTL_NODE(_kern, OID_AUTO, rndtest, CTLFLAG_RD, 0,
+	    "RNG test parameters");
 static	int rndtest_retest = 120;		/* interval in seconds */
 SYSCTL_INT(_kern_rndtest, OID_AUTO, retest, CTLFLAG_RW, &rndtest_retest,
 	    0, "retest interval (seconds)");

Modified: trunk/sys/dev/rt/if_rt.c
===================================================================
--- trunk/sys/dev/rt/if_rt.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/rt/if_rt.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -136,7 +136,7 @@
 static int	rt_ifmedia_upd(struct ifnet *);
 static void	rt_ifmedia_sts(struct ifnet *, struct ifmediareq *);
 
-SYSCTL_NODE(_hw, OID_AUTO, rt, CTLFLAG_RD, 0, "RT driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, rt, CTLFLAG_RD, 0, "RT driver parameters");
 #ifdef IF_RT_DEBUG
 static int rt_debug = 0;
 SYSCTL_INT(_hw_rt, OID_AUTO, debug, CTLFLAG_RW, &rt_debug, 0,

Modified: trunk/sys/dev/sdhci/sdhci.c
===================================================================
--- trunk/sys/dev/sdhci/sdhci.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/sdhci/sdhci.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -158,7 +158,7 @@
 	struct sdhci_slot slots[6];
 };
 
-SYSCTL_NODE(_hw, OID_AUTO, sdhci, CTLFLAG_RD, 0, "sdhci driver");
+static SYSCTL_NODE(_hw, OID_AUTO, sdhci, CTLFLAG_RD, 0, "sdhci driver");
 
 int	sdhci_debug;
 TUNABLE_INT("hw.sdhci.debug", &sdhci_debug);

Modified: trunk/sys/dev/sound/midi/midi.c
===================================================================
--- trunk/sys/dev/sound/midi/midi.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/sound/midi/midi.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -239,7 +239,7 @@
  * Misc declr.
  */
 SYSCTL_NODE(_hw, OID_AUTO, midi, CTLFLAG_RD, 0, "Midi driver");
-SYSCTL_NODE(_hw_midi, OID_AUTO, stat, CTLFLAG_RD, 0, "Status device");
+static SYSCTL_NODE(_hw_midi, OID_AUTO, stat, CTLFLAG_RD, 0, "Status device");
 
 int             midi_debug;
 /* XXX: should this be moved into debug.midi? */

Modified: trunk/sys/dev/sound/pci/maestro.c
===================================================================
--- trunk/sys/dev/sound/pci/maestro.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/sound/pci/maestro.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -191,7 +191,7 @@
 /* XXX: this should move to a device specific sysctl dev.pcm.X.debug.Y via
    device_get_sysctl_*() as discussed on multimedia@ in msg-id
    <861wujij2q.fsf at xps.des.no> */
-SYSCTL_NODE(_debug, OID_AUTO, maestro, CTLFLAG_RD, 0, "");
+static SYSCTL_NODE(_debug, OID_AUTO, maestro, CTLFLAG_RD, 0, "");
 SYSCTL_UINT(_debug_maestro, OID_AUTO, powerstate_active, CTLFLAG_RW,
 	    &powerstate_active, 0, "The Dx power state when active (0-1)");
 SYSCTL_UINT(_debug_maestro, OID_AUTO, powerstate_idle, CTLFLAG_RW,

Modified: trunk/sys/dev/sound/usb/uaudio.c
===================================================================
--- trunk/sys/dev/sound/usb/uaudio.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/sound/usb/uaudio.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -98,7 +98,7 @@
 #ifdef USB_DEBUG
 static int uaudio_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio");
 
 SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RW,
     &uaudio_debug, 0, "uaudio debug level");

Modified: trunk/sys/dev/syscons/syscons.c
===================================================================
--- trunk/sys/dev/syscons/syscons.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/syscons/syscons.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -137,8 +137,8 @@
 #endif
 static	int		sc_susp_scr;
 
-SYSCTL_NODE(_hw, OID_AUTO, syscons, CTLFLAG_RD, 0, "syscons");
-SYSCTL_NODE(_hw_syscons, OID_AUTO, saver, CTLFLAG_RD, 0, "saver");
+static SYSCTL_NODE(_hw, OID_AUTO, syscons, CTLFLAG_RD, 0, "syscons");
+static SYSCTL_NODE(_hw_syscons, OID_AUTO, saver, CTLFLAG_RD, 0, "saver");
 SYSCTL_INT(_hw_syscons_saver, OID_AUTO, keybonly, CTLFLAG_RW,
     &sc_saver_keyb_only, 0, "screen saver interrupted by input only");
 SYSCTL_INT(_hw_syscons, OID_AUTO, bell, CTLFLAG_RW, &enable_bell, 

Modified: trunk/sys/dev/ubsec/ubsec.c
===================================================================
--- trunk/sys/dev/ubsec/ubsec.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/ubsec/ubsec.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -174,7 +174,8 @@
 static	void ubsec_kshift_r(u_int, u_int8_t *, u_int, u_int8_t *, u_int);
 static	void ubsec_kshift_l(u_int, u_int8_t *, u_int, u_int8_t *, u_int);
 
-SYSCTL_NODE(_hw, OID_AUTO, ubsec, CTLFLAG_RD, 0, "Broadcom driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, ubsec, CTLFLAG_RD, 0,
+    "Broadcom driver parameters");
 
 #ifdef UBSEC_DEBUG
 static	void ubsec_dump_pb(volatile struct ubsec_pktbuf *);

Modified: trunk/sys/dev/wi/if_wi.c
===================================================================
--- trunk/sys/dev/wi/if_wi.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/wi/if_wi.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -169,7 +169,8 @@
 	return wi_write_rid(sc, rid, &val, sizeof(val));
 }
 
-SYSCTL_NODE(_hw, OID_AUTO, wi, CTLFLAG_RD, 0, "Wireless driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, wi, CTLFLAG_RD, 0,
+	    "Wireless driver parameters");
 
 static	struct timeval lasttxerror;	/* time of last tx error msg */
 static	int curtxeps;			/* current tx error msgs/sec */

Modified: trunk/sys/dev/xe/if_xe.c
===================================================================
--- trunk/sys/dev/xe/if_xe.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/xe/if_xe.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -202,7 +202,7 @@
 #ifdef XE_DEBUG
 
 /* sysctl vars */
-SYSCTL_NODE(_hw, OID_AUTO, xe, CTLFLAG_RD, 0, "if_xe parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, xe, CTLFLAG_RD, 0, "if_xe parameters");
 
 int xe_debug = 0;
 SYSCTL_INT(_hw_xe, OID_AUTO, debug, CTLFLAG_RW, &xe_debug, 0,

Modified: trunk/sys/dev/xen/balloon/balloon.c
===================================================================
--- trunk/sys/dev/xen/balloon/balloon.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/dev/xen/balloon/balloon.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -84,7 +84,7 @@
 #define bs balloon_stats
 
 SYSCTL_DECL(_dev_xen);
-SYSCTL_NODE(_dev_xen, OID_AUTO, balloon, CTLFLAG_RD, NULL, "Balloon");
+static SYSCTL_NODE(_dev_xen, OID_AUTO, balloon, CTLFLAG_RD, NULL, "Balloon");
 SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, current, CTLFLAG_RD,
     &bs.current_pages, 0, "Current allocation");
 SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, target, CTLFLAG_RD,

Modified: trunk/sys/fs/ext2fs/ext2_alloc.c
===================================================================
--- trunk/sys/fs/ext2fs/ext2_alloc.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/fs/ext2fs/ext2_alloc.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -145,7 +145,7 @@
  * the previous block allocation will be used.
  */
 
-SYSCTL_NODE(_vfs, OID_AUTO, ext2fs, CTLFLAG_RW, 0, "EXT2FS filesystem");
+static SYSCTL_NODE(_vfs, OID_AUTO, ext2fs, CTLFLAG_RW, 0, "EXT2FS filesystem");
 
 static int doasyncfree = 0;
 SYSCTL_INT(_vfs_ext2fs, OID_AUTO, doasyncfree, CTLFLAG_RW, &doasyncfree, 0,

Modified: trunk/sys/fs/pseudofs/pseudofs_vncache.c
===================================================================
--- trunk/sys/fs/pseudofs/pseudofs_vncache.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/fs/pseudofs/pseudofs_vncache.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -52,7 +52,7 @@
 static eventhandler_tag pfs_exit_tag;
 static void pfs_exit(void *arg, struct proc *p);
 
-SYSCTL_NODE(_vfs_pfs, OID_AUTO, vncache, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_vfs_pfs, OID_AUTO, vncache, CTLFLAG_RW, 0,
     "pseudofs vnode cache");
 
 static int pfs_vncache_entries;

Modified: trunk/sys/geom/cache/g_cache.c
===================================================================
--- trunk/sys/geom/cache/g_cache.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/cache/g_cache.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -49,7 +49,8 @@
 static MALLOC_DEFINE(M_GCACHE, "gcache_data", "GEOM_CACHE Data");
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, cache, CTLFLAG_RW, 0, "GEOM_CACHE stuff");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, cache, CTLFLAG_RW, 0,
+    "GEOM_CACHE stuff");
 static u_int g_cache_debug = 0;
 SYSCTL_UINT(_kern_geom_cache, OID_AUTO, debug, CTLFLAG_RW, &g_cache_debug, 0,
     "Debug level");

Modified: trunk/sys/geom/concat/g_concat.c
===================================================================
--- trunk/sys/geom/concat/g_concat.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/concat/g_concat.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/concat/g_concat.c,v 1.6 2012/10/06 04:54:38 laffer1 Exp $ */
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd at FreeBSD.org>
  * All rights reserved.
@@ -46,7 +46,8 @@
 static MALLOC_DEFINE(M_CONCAT, "concat_data", "GEOM_CONCAT Data");
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, concat, CTLFLAG_RW, 0, "GEOM_CONCAT stuff");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, concat, CTLFLAG_RW, 0,
+    "GEOM_CONCAT stuff");
 static u_int g_concat_debug = 0;
 TUNABLE_INT("kern.geom.concat.debug", &g_concat_debug);
 SYSCTL_UINT(_kern_geom_concat, OID_AUTO, debug, CTLFLAG_RW, &g_concat_debug, 0,

Modified: trunk/sys/geom/geom_disk.c
===================================================================
--- trunk/sys/geom/geom_disk.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/geom_disk.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -91,7 +91,8 @@
 };
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, disk, CTLFLAG_RW, 0, "GEOM_DISK stuff");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, disk, CTLFLAG_RW, 0,
+    "GEOM_DISK stuff");
 
 static void
 g_disk_init(struct g_class *mp __unused)

Modified: trunk/sys/geom/journal/g_journal.c
===================================================================
--- trunk/sys/geom/journal/g_journal.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/journal/g_journal.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -93,7 +93,8 @@
 static u_int g_journal_record_entries = GJ_RECORD_HEADER_NENTRIES;
 static u_int g_journal_do_optimize = 1;
 
-SYSCTL_NODE(_kern_geom, OID_AUTO, journal, CTLFLAG_RW, 0, "GEOM_JOURNAL stuff");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, journal, CTLFLAG_RW, 0,
+    "GEOM_JOURNAL stuff");
 SYSCTL_INT(_kern_geom_journal, OID_AUTO, debug, CTLFLAG_RW, &g_journal_debug, 0,
     "Debug level");
 SYSCTL_UINT(_kern_geom_journal, OID_AUTO, switch_time, CTLFLAG_RW,
@@ -140,7 +141,7 @@
 static u_int g_journal_cache_alloc_failures = 0;
 static u_int g_journal_cache_low = 0;
 
-SYSCTL_NODE(_kern_geom_journal, OID_AUTO, cache, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_kern_geom_journal, OID_AUTO, cache, CTLFLAG_RW, 0,
     "GEOM_JOURNAL cache");
 SYSCTL_UINT(_kern_geom_journal_cache, OID_AUTO, used, CTLFLAG_RD,
     &g_journal_cache_used, 0, "Number of allocated bytes");
@@ -195,7 +196,7 @@
 static u_long g_journal_stats_journal_full = 0;
 static u_long g_journal_stats_low_mem = 0;
 
-SYSCTL_NODE(_kern_geom_journal, OID_AUTO, stats, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_kern_geom_journal, OID_AUTO, stats, CTLFLAG_RW, 0,
     "GEOM_JOURNAL statistics");
 SYSCTL_ULONG(_kern_geom_journal_stats, OID_AUTO, skipped_bytes, CTLFLAG_RW,
     &g_journal_stats_bytes_skipped, 0, "Number of skipped bytes");

Modified: trunk/sys/geom/mirror/g_mirror.c
===================================================================
--- trunk/sys/geom/mirror/g_mirror.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/mirror/g_mirror.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -51,7 +51,8 @@
 static MALLOC_DEFINE(M_MIRROR, "mirror_data", "GEOM_MIRROR Data");
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, mirror, CTLFLAG_RW, 0, "GEOM_MIRROR stuff");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, mirror, CTLFLAG_RW, 0,
+    "GEOM_MIRROR stuff");
 u_int g_mirror_debug = 0;
 TUNABLE_INT("kern.geom.mirror.debug", &g_mirror_debug);
 SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, debug, CTLFLAG_RW, &g_mirror_debug, 0,

Modified: trunk/sys/geom/mountver/g_mountver.c
===================================================================
--- trunk/sys/geom/mountver/g_mountver.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/mountver/g_mountver.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -46,7 +46,7 @@
 
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, mountver, CTLFLAG_RW,
+static SYSCTL_NODE(_kern_geom, OID_AUTO, mountver, CTLFLAG_RW,
     0, "GEOM_MOUNTVER stuff");
 static u_int g_mountver_debug = 0;
 static u_int g_mountver_check_ident = 1;

Modified: trunk/sys/geom/multipath/g_multipath.c
===================================================================
--- trunk/sys/geom/multipath/g_multipath.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/multipath/g_multipath.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -50,7 +50,7 @@
 FEATURE(geom_multipath, "GEOM multipath support");
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, multipath, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_kern_geom, OID_AUTO, multipath, CTLFLAG_RW, 0,
     "GEOM_MULTIPATH tunables");
 static u_int g_multipath_debug = 0;
 SYSCTL_UINT(_kern_geom_multipath, OID_AUTO, debug, CTLFLAG_RW,

Modified: trunk/sys/geom/nop/g_nop.c
===================================================================
--- trunk/sys/geom/nop/g_nop.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/nop/g_nop.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -43,7 +43,7 @@
 
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, nop, CTLFLAG_RW, 0, "GEOM_NOP stuff");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, nop, CTLFLAG_RW, 0, "GEOM_NOP stuff");
 static u_int g_nop_debug = 0;
 SYSCTL_UINT(_kern_geom_nop, OID_AUTO, debug, CTLFLAG_RW, &g_nop_debug, 0,
     "Debug level");

Modified: trunk/sys/geom/raid3/g_raid3.c
===================================================================
--- trunk/sys/geom/raid3/g_raid3.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/raid3/g_raid3.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -52,7 +52,8 @@
 static MALLOC_DEFINE(M_RAID3, "raid3_data", "GEOM_RAID3 Data");
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, raid3, CTLFLAG_RW, 0, "GEOM_RAID3 stuff");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, raid3, CTLFLAG_RW, 0,
+    "GEOM_RAID3 stuff");
 u_int g_raid3_debug = 0;
 TUNABLE_INT("kern.geom.raid3.debug", &g_raid3_debug);
 SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, debug, CTLFLAG_RW, &g_raid3_debug, 0,
@@ -92,7 +93,7 @@
 SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, n4k, CTLFLAG_RD, &g_raid3_n4k, 0,
     "Maximum number of 4kB allocations");
 
-SYSCTL_NODE(_kern_geom_raid3, OID_AUTO, stat, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_kern_geom_raid3, OID_AUTO, stat, CTLFLAG_RW, 0,
     "GEOM_RAID3 statistics");
 static u_int g_raid3_parity_mismatch = 0;
 SYSCTL_UINT(_kern_geom_raid3_stat, OID_AUTO, parity_mismatch, CTLFLAG_RD,

Modified: trunk/sys/geom/sched/gs_rr.c
===================================================================
--- trunk/sys/geom/sched/gs_rr.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/sched/gs_rr.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -198,7 +198,7 @@
 struct g_rr_params *gs_rr_me = &me;
 
 SYSCTL_DECL(_kern_geom_sched);
-SYSCTL_NODE(_kern_geom_sched, OID_AUTO, rr, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_kern_geom_sched, OID_AUTO, rr, CTLFLAG_RW, 0,
     "GEOM_SCHED ROUND ROBIN stuff");
 SYSCTL_INT(_kern_geom_sched_rr, OID_AUTO, units, CTLFLAG_RD,
     &me.units, 0, "Scheduler instances");

Modified: trunk/sys/geom/shsec/g_shsec.c
===================================================================
--- trunk/sys/geom/shsec/g_shsec.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/shsec/g_shsec.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/shsec/g_shsec.c,v 1.3 2008/12/03 00:25:50 laffer1 Exp $ */
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2005 Pawel Jakub Dawidek <pjd at FreeBSD.org>
  * All rights reserved.
@@ -69,7 +69,8 @@
 };
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, shsec, CTLFLAG_RW, 0, "GEOM_SHSEC stuff");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, shsec, CTLFLAG_RW, 0,
+    "GEOM_SHSEC stuff");
 static u_int g_shsec_debug = 0;
 TUNABLE_INT("kern.geom.shsec.debug", &g_shsec_debug);
 SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, debug, CTLFLAG_RW, &g_shsec_debug, 0,

Modified: trunk/sys/geom/stripe/g_stripe.c
===================================================================
--- trunk/sys/geom/stripe/g_stripe.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/stripe/g_stripe.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/stripe/g_stripe.c,v 1.5 2012/03/31 16:58:05 laffer1 Exp $ */
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd at FreeBSD.org>
  * All rights reserved.
@@ -69,7 +69,8 @@
 };
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, stripe, CTLFLAG_RW, 0, "GEOM_STRIPE stuff");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, stripe, CTLFLAG_RW, 0,
+    "GEOM_STRIPE stuff");
 static u_int g_stripe_debug = 0;
 TUNABLE_INT("kern.geom.stripe.debug", &g_stripe_debug);
 SYSCTL_UINT(_kern_geom_stripe, OID_AUTO, debug, CTLFLAG_RW, &g_stripe_debug, 0,

Modified: trunk/sys/geom/vinum/geom_vinum.c
===================================================================
--- trunk/sys/geom/vinum/geom_vinum.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/vinum/geom_vinum.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -47,7 +47,8 @@
 #include <geom/vinum/geom_vinum_raid5.h>
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, vinum, CTLFLAG_RW, 0, "GEOM_VINUM stuff");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, vinum, CTLFLAG_RW, 0,
+    "GEOM_VINUM stuff");
 u_int g_vinum_debug = 0;
 TUNABLE_INT("kern.geom.vinum.debug", &g_vinum_debug);
 SYSCTL_UINT(_kern_geom_vinum, OID_AUTO, debug, CTLFLAG_RW, &g_vinum_debug, 0,

Modified: trunk/sys/geom/virstor/g_virstor.c
===================================================================
--- trunk/sys/geom/virstor/g_virstor.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/virstor/g_virstor.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -80,7 +80,8 @@
 
 /* Declare sysctl's and loader tunables */
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, virstor, CTLFLAG_RW, 0, "GEOM_GVIRSTOR information");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, virstor, CTLFLAG_RW, 0,
+    "GEOM_GVIRSTOR information");
 
 static u_int g_virstor_debug = 2; /* XXX: lower to 2 when released to public */
 TUNABLE_INT("kern.geom.virstor.debug", &g_virstor_debug);

Modified: trunk/sys/geom/zero/g_zero.c
===================================================================
--- trunk/sys/geom/zero/g_zero.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/geom/zero/g_zero.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/zero/g_zero.c,v 1.3 2008/12/03 00:25:52 laffer1 Exp $ */
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2005 Pawel Jakub Dawidek <pjd at FreeBSD.org>
  * All rights reserved.
@@ -43,7 +43,8 @@
 #define	G_ZERO_CLASS_NAME	"ZERO"
 
 SYSCTL_DECL(_kern_geom);
-SYSCTL_NODE(_kern_geom, OID_AUTO, zero, CTLFLAG_RW, 0, "GEOM_ZERO stuff");
+static SYSCTL_NODE(_kern_geom, OID_AUTO, zero, CTLFLAG_RW, 0,
+    "GEOM_ZERO stuff");
 static int g_zero_clear = 1;
 SYSCTL_INT(_kern_geom_zero, OID_AUTO, clear, CTLFLAG_RW, &g_zero_clear, 0,
     "Clear read data buffer");

Modified: trunk/sys/gnu/fs/xfs/FreeBSD/support/debug.c
===================================================================
--- trunk/sys/gnu/fs/xfs/FreeBSD/support/debug.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/gnu/fs/xfs/FreeBSD/support/debug.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -41,7 +41,7 @@
 
 #include <support/debug.h>
 
-SYSCTL_NODE(_debug, OID_AUTO, xfs, CTLFLAG_RD, 0, "XFS debug options");
+static SYSCTL_NODE(_debug, OID_AUTO, xfs, CTLFLAG_RD, 0, "XFS debug options");
 
 static int verbosity = 10;
 SYSCTL_INT(_debug_xfs, OID_AUTO, verbosity, CTLFLAG_RW, &verbosity, 0, "");

Modified: trunk/sys/i386/i386/mp_machdep.c
===================================================================
--- trunk/sys/i386/i386/mp_machdep.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/i386/i386/mp_machdep.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -1152,7 +1152,7 @@
 u_int xhits_gbl[MAXCPU];
 u_int xhits_pg[MAXCPU];
 u_int xhits_rng[MAXCPU];
-SYSCTL_NODE(_debug, OID_AUTO, xhits, CTLFLAG_RW, 0, "");
+static SYSCTL_NODE(_debug, OID_AUTO, xhits, CTLFLAG_RW, 0, "");
 SYSCTL_OPAQUE(_debug_xhits, OID_AUTO, global, CTLFLAG_RW, &xhits_gbl,
     sizeof(xhits_gbl), "IU", "");
 SYSCTL_OPAQUE(_debug_xhits, OID_AUTO, page, CTLFLAG_RW, &xhits_pg,

Modified: trunk/sys/i386/i386/pmap.c
===================================================================
--- trunk/sys/i386/i386/pmap.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/i386/i386/pmap.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -224,7 +224,7 @@
 static uma_zone_t pdptzone;
 #endif
 
-SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
+static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
 
 static int pat_works = 1;
 SYSCTL_INT(_vm_pmap, OID_AUTO, pat_works, CTLFLAG_RD, &pat_works, 1,
@@ -823,7 +823,7 @@
 SYSCTL_INT(_vm_pmap, OID_AUTO, shpgperproc, CTLFLAG_RD, &shpgperproc, 0,
 	"Page share factor per proc");
 
-SYSCTL_NODE(_vm_pmap, OID_AUTO, pde, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_vm_pmap, OID_AUTO, pde, CTLFLAG_RD, 0,
     "2/4MB page mapping counters");
 
 static u_long pmap_pde_demotions;

Modified: trunk/sys/kern/kern_clock.c
===================================================================
--- trunk/sys/kern/kern_clock.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/kern_clock.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -311,7 +311,8 @@
 
 SYSINIT(deadlkres, SI_SUB_CLOCKS, SI_ORDER_ANY, kthread_start, &deadlkres_kd);
 
-SYSCTL_NODE(_debug, OID_AUTO, deadlkres, CTLFLAG_RW, 0, "Deadlock resolver");
+static SYSCTL_NODE(_debug, OID_AUTO, deadlkres, CTLFLAG_RW, 0,
+    "Deadlock resolver");
 SYSCTL_INT(_debug_deadlkres, OID_AUTO, slptime_threshold, CTLFLAG_RW,
     &slptime_threshold, 0,
     "Number of seconds within is valid to sleep on a sleepqueue");

Modified: trunk/sys/kern/kern_et.c
===================================================================
--- trunk/sys/kern/kern_et.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/kern_et.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -41,7 +41,7 @@
 MTX_SYSINIT(et_eventtimers_init, &et_eventtimers_mtx, "et_mtx", MTX_DEF);
 
 SYSCTL_NODE(_kern, OID_AUTO, eventtimer, CTLFLAG_RW, 0, "Event timers");
-SYSCTL_NODE(_kern_eventtimer, OID_AUTO, et, CTLFLAG_RW, 0, "");
+static SYSCTL_NODE(_kern_eventtimer, OID_AUTO, et, CTLFLAG_RW, 0, "");
 
 /*
  * Register a new event timer hardware.

Modified: trunk/sys/kern/kern_jail.c
===================================================================
--- trunk/sys/kern/kern_jail.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/kern_jail.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -4028,7 +4028,7 @@
 /*
  * Jail-related sysctls.
  */
-SYSCTL_NODE(_security, OID_AUTO, jail, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security, OID_AUTO, jail, CTLFLAG_RW, 0,
     "Jails");
 
 static int

Modified: trunk/sys/kern/kern_ktr.c
===================================================================
--- trunk/sys/kern/kern_ktr.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/kern_ktr.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -80,7 +80,7 @@
 
 FEATURE(ktr, "Kernel support for KTR kernel tracing facility");
 
-SYSCTL_NODE(_debug, OID_AUTO, ktr, CTLFLAG_RD, 0, "KTR options");
+static SYSCTL_NODE(_debug, OID_AUTO, ktr, CTLFLAG_RD, 0, "KTR options");
 
 int	ktr_mask = KTR_MASK;
 TUNABLE_INT("debug.ktr.mask", &ktr_mask);

Modified: trunk/sys/kern/kern_malloc.c
===================================================================
--- trunk/sys/kern/kern_malloc.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/kern_malloc.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -231,7 +231,7 @@
 static time_t t_malloc_fail;
 
 #if defined(MALLOC_MAKE_FAILURES) || (MALLOC_DEBUG_MAXZONES > 1)
-SYSCTL_NODE(_debug, OID_AUTO, malloc, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_debug, OID_AUTO, malloc, CTLFLAG_RD, 0,
     "Kernel malloc debugging options");
 #endif
 

Modified: trunk/sys/kern/kern_poll.c
===================================================================
--- trunk/sys/kern/kern_poll.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/kern_poll.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -98,7 +98,7 @@
 static uint32_t poll_burst_max = 150;	/* good for 100Mbit net and HZ=1000 */
 static uint32_t poll_each_burst = 5;
 
-SYSCTL_NODE(_kern, OID_AUTO, polling, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_kern, OID_AUTO, polling, CTLFLAG_RW, 0,
 	"Device polling parameters");
 
 SYSCTL_UINT(_kern_polling, OID_AUTO, burst, CTLFLAG_RD,

Modified: trunk/sys/kern/kern_shutdown.c
===================================================================
--- trunk/sys/kern/kern_shutdown.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/kern_shutdown.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -126,7 +126,8 @@
     &stop_scheduler_on_panic, 0, "stop scheduler upon entering panic");
 TUNABLE_INT("kern.stop_scheduler_on_panic", &stop_scheduler_on_panic);
 
-SYSCTL_NODE(_kern, OID_AUTO, shutdown, CTLFLAG_RW, 0, "Shutdown environment");
+static SYSCTL_NODE(_kern, OID_AUTO, shutdown, CTLFLAG_RW, 0,
+    "Shutdown environment");
 
 #ifndef DIAGNOSTIC
 static int show_busybufs;

Modified: trunk/sys/kern/kern_sig.c
===================================================================
--- trunk/sys/kern/kern_sig.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/kern_sig.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -136,7 +136,8 @@
 SYSCTL_INT(_kern, OID_AUTO, forcesigexit, CTLFLAG_RW,
     &kern_forcesigexit, 0, "Force trap signal to be handled");
 
-SYSCTL_NODE(_kern, OID_AUTO, sigqueue, CTLFLAG_RW, 0, "POSIX real time signal");
+static SYSCTL_NODE(_kern, OID_AUTO, sigqueue, CTLFLAG_RW, 0,
+    "POSIX real time signal");
 
 static int	max_pending_per_proc = 128;
 SYSCTL_INT(_kern_sigqueue, OID_AUTO, max_pending_per_proc, CTLFLAG_RW,

Modified: trunk/sys/kern/kern_thr.c
===================================================================
--- trunk/sys/kern/kern_thr.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/kern_thr.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -58,7 +58,8 @@
 
 #include <security/audit/audit.h>
 
-SYSCTL_NODE(_kern, OID_AUTO, threads, CTLFLAG_RW, 0, "thread allocation");
+static SYSCTL_NODE(_kern, OID_AUTO, threads, CTLFLAG_RW, 0,
+    "thread allocation");
 
 static int max_threads_per_proc = 1500;
 SYSCTL_INT(_kern_threads, OID_AUTO, max_threads_per_proc, CTLFLAG_RW,

Modified: trunk/sys/kern/kern_umtx.c
===================================================================
--- trunk/sys/kern/kern_umtx.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/kern_umtx.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -192,7 +192,7 @@
 static MALLOC_DEFINE(M_UMTX, "umtx", "UMTX queue memory");
 static int			umtx_pi_allocated;
 
-SYSCTL_NODE(_debug, OID_AUTO, umtx, CTLFLAG_RW, 0, "umtx debug");
+static SYSCTL_NODE(_debug, OID_AUTO, umtx, CTLFLAG_RW, 0, "umtx debug");
 SYSCTL_INT(_debug_umtx, OID_AUTO, umtx_pi_allocated, CTLFLAG_RD,
     &umtx_pi_allocated, 0, "Allocated umtx_pi");
 

Modified: trunk/sys/kern/sched_4bsd.c
===================================================================
--- trunk/sys/kern/sched_4bsd.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/sched_4bsd.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -214,7 +214,8 @@
     "Quantum for timeshare threads in stathz ticks");
 #ifdef SMP
 /* Enable forwarding of wakeups to all other cpus */
-SYSCTL_NODE(_kern_sched, OID_AUTO, ipiwakeup, CTLFLAG_RD, NULL, "Kernel SMP");
+static SYSCTL_NODE(_kern_sched, OID_AUTO, ipiwakeup, CTLFLAG_RD, NULL,
+    "Kernel SMP");
 
 static int runq_fuzz = 1;
 SYSCTL_INT(_kern_sched, OID_AUTO, runq_fuzz, CTLFLAG_RW, &runq_fuzz, 0, "");

Modified: trunk/sys/kern/subr_devstat.c
===================================================================
--- trunk/sys/kern/subr_devstat.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/subr_devstat.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -460,7 +460,8 @@
  * Sysctl entries for devstat.  The first one is a node that all the rest
  * hang off of. 
  */
-SYSCTL_NODE(_kern, OID_AUTO, devstat, CTLFLAG_RD, NULL, "Device Statistics");
+static SYSCTL_NODE(_kern, OID_AUTO, devstat, CTLFLAG_RD, NULL,
+    "Device Statistics");
 
 SYSCTL_PROC(_kern_devstat, OID_AUTO, all, CTLFLAG_RD|CTLTYPE_OPAQUE,
     NULL, 0, sysctl_devstat, "S,devstat", "All devices in the devstat list");

Modified: trunk/sys/kern/subr_kdb.c
===================================================================
--- trunk/sys/kern/subr_kdb.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/subr_kdb.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -83,7 +83,7 @@
 static int kdb_sysctl_trap(SYSCTL_HANDLER_ARGS);
 static int kdb_sysctl_trap_code(SYSCTL_HANDLER_ARGS);
 
-SYSCTL_NODE(_debug, OID_AUTO, kdb, CTLFLAG_RW, NULL, "KDB nodes");
+static SYSCTL_NODE(_debug, OID_AUTO, kdb, CTLFLAG_RW, NULL, "KDB nodes");
 
 SYSCTL_PROC(_debug_kdb, OID_AUTO, available, CTLTYPE_STRING | CTLFLAG_RD, NULL,
     0, kdb_sysctl_available, "A", "list of available KDB backends");

Modified: trunk/sys/kern/subr_lock.c
===================================================================
--- trunk/sys/kern/subr_lock.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/subr_lock.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -650,8 +650,9 @@
 	critical_exit();
 }
 
-SYSCTL_NODE(_debug, OID_AUTO, lock, CTLFLAG_RD, NULL, "lock debugging");
-SYSCTL_NODE(_debug_lock, OID_AUTO, prof, CTLFLAG_RD, NULL, "lock profiling");
+static SYSCTL_NODE(_debug, OID_AUTO, lock, CTLFLAG_RD, NULL, "lock debugging");
+static SYSCTL_NODE(_debug_lock, OID_AUTO, prof, CTLFLAG_RD, NULL,
+    "lock profiling");
 SYSCTL_INT(_debug_lock_prof, OID_AUTO, skipspin, CTLFLAG_RW,
     &lock_prof_skipspin, 0, "Skip profiling on spinlocks.");
 SYSCTL_INT(_debug_lock_prof, OID_AUTO, skipcount, CTLFLAG_RW,

Modified: trunk/sys/kern/subr_prof.c
===================================================================
--- trunk/sys/kern/subr_prof.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/subr_prof.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -385,7 +385,7 @@
 	/* NOTREACHED */
 }
 
-SYSCTL_NODE(_kern, KERN_PROF, prof, CTLFLAG_RW, sysctl_kern_prof, "");
+static SYSCTL_NODE(_kern, KERN_PROF, prof, CTLFLAG_RW, sysctl_kern_prof, "");
 #endif /* GPROF */
 
 /*

Modified: trunk/sys/kern/subr_rman.c
===================================================================
--- trunk/sys/kern/subr_rman.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/subr_rman.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -1085,7 +1085,7 @@
 	return (error);
 }
 
-SYSCTL_NODE(_hw_bus, OID_AUTO, rman, CTLFLAG_RD, sysctl_rman,
+static SYSCTL_NODE(_hw_bus, OID_AUTO, rman, CTLFLAG_RD, sysctl_rman,
     "kernel resource manager");
 
 #ifdef DDB

Modified: trunk/sys/kern/subr_sleepqueue.c
===================================================================
--- trunk/sys/kern/subr_sleepqueue.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/subr_sleepqueue.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -141,8 +141,8 @@
 
 #ifdef SLEEPQUEUE_PROFILING
 u_int sleepq_max_depth;
-SYSCTL_NODE(_debug, OID_AUTO, sleepq, CTLFLAG_RD, 0, "sleepq profiling");
-SYSCTL_NODE(_debug_sleepq, OID_AUTO, chains, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_debug, OID_AUTO, sleepq, CTLFLAG_RD, 0, "sleepq profiling");
+static SYSCTL_NODE(_debug_sleepq, OID_AUTO, chains, CTLFLAG_RD, 0,
     "sleepq chain stats");
 SYSCTL_UINT(_debug_sleepq, OID_AUTO, max_depth, CTLFLAG_RD, &sleepq_max_depth,
     0, "maxmimum depth achieved of a single chain");

Modified: trunk/sys/kern/subr_smp.c
===================================================================
--- trunk/sys/kern/subr_smp.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/subr_smp.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$MidnightBSD: src/sys/kern/subr_smp.c,v 1.6 2012/10/09 04:08:16 laffer1 Exp $");
+__FBSDID("$MidnightBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -70,7 +70,8 @@
 volatile int smp_started;
 u_int mp_maxid;
 
-SYSCTL_NODE(_kern, OID_AUTO, smp, CTLFLAG_RD|CTLFLAG_CAPRD, NULL, "Kernel SMP");
+static SYSCTL_NODE(_kern, OID_AUTO, smp, CTLFLAG_RD|CTLFLAG_CAPRD, NULL,
+    "Kernel SMP");
 
 SYSCTL_INT(_kern_smp, OID_AUTO, maxid, CTLFLAG_RD|CTLFLAG_CAPRD, &mp_maxid, 0,
     "Max CPU ID.");

Modified: trunk/sys/kern/subr_turnstile.c
===================================================================
--- trunk/sys/kern/subr_turnstile.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/subr_turnstile.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -140,8 +140,9 @@
 
 #ifdef TURNSTILE_PROFILING
 u_int turnstile_max_depth;
-SYSCTL_NODE(_debug, OID_AUTO, turnstile, CTLFLAG_RD, 0, "turnstile profiling");
-SYSCTL_NODE(_debug_turnstile, OID_AUTO, chains, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_debug, OID_AUTO, turnstile, CTLFLAG_RD, 0,
+    "turnstile profiling");
+static SYSCTL_NODE(_debug_turnstile, OID_AUTO, chains, CTLFLAG_RD, 0,
     "turnstile chain stats");
 SYSCTL_UINT(_debug_turnstile, OID_AUTO, max_depth, CTLFLAG_RD,
     &turnstile_max_depth, 0, "maximum depth achieved of a single chain");

Modified: trunk/sys/kern/subr_witness.c
===================================================================
--- trunk/sys/kern/subr_witness.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/subr_witness.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -376,7 +376,8 @@
 #define	witness_debugger(c)
 #endif
 
-SYSCTL_NODE(_debug, OID_AUTO, witness, CTLFLAG_RW, NULL, "Witness Locking");
+static SYSCTL_NODE(_debug, OID_AUTO, witness, CTLFLAG_RW, NULL,
+    "Witness Locking");
 
 /*
  * If set to 0, lock order checking is disabled.  If set to -1,

Modified: trunk/sys/kern/uipc_mqueue.c
===================================================================
--- trunk/sys/kern/uipc_mqueue.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/uipc_mqueue.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -186,7 +186,7 @@
 	/* following real data... */
 };
 
-SYSCTL_NODE(_kern, OID_AUTO, mqueue, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_kern, OID_AUTO, mqueue, CTLFLAG_RW, 0,
 	"POSIX real time message queue");
 
 static int	default_maxmsg  = 10;

Modified: trunk/sys/kern/uipc_usrreq.c
===================================================================
--- trunk/sys/kern/uipc_usrreq.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/uipc_usrreq.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -159,10 +159,11 @@
 static u_long	unpsp_sendspace = PIPSIZ;	/* really max datagram size */
 static u_long	unpsp_recvspace = PIPSIZ;
 
-SYSCTL_NODE(_net, PF_LOCAL, local, CTLFLAG_RW, 0, "Local domain");
-SYSCTL_NODE(_net_local, SOCK_STREAM, stream, CTLFLAG_RW, 0, "SOCK_STREAM");
-SYSCTL_NODE(_net_local, SOCK_DGRAM, dgram, CTLFLAG_RW, 0, "SOCK_DGRAM");
-SYSCTL_NODE(_net_local, SOCK_SEQPACKET, seqpacket, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_net, PF_LOCAL, local, CTLFLAG_RW, 0, "Local domain");
+static SYSCTL_NODE(_net_local, SOCK_STREAM, stream, CTLFLAG_RW, 0,
+    "SOCK_STREAM");
+static SYSCTL_NODE(_net_local, SOCK_DGRAM, dgram, CTLFLAG_RW, 0, "SOCK_DGRAM");
+static SYSCTL_NODE(_net_local, SOCK_SEQPACKET, seqpacket, CTLFLAG_RW, 0,
     "SOCK_SEQPACKET");
 
 SYSCTL_ULONG(_net_local_stream, OID_AUTO, sendspace, CTLFLAG_RW,

Modified: trunk/sys/kern/vfs_cache.c
===================================================================
--- trunk/sys/kern/vfs_cache.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/kern/vfs_cache.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -318,7 +318,8 @@
 /*
  * Grab an atomic snapshot of the name cache hash chain lengths
  */
-SYSCTL_NODE(_debug, OID_AUTO, hashstat, CTLFLAG_RW, NULL, "hash table stats");
+static SYSCTL_NODE(_debug, OID_AUTO, hashstat, CTLFLAG_RW, NULL,
+    "hash table stats");
 
 static int
 sysctl_debug_hashstat_rawnchash(SYSCTL_HANDLER_ARGS)

Modified: trunk/sys/net/bpf.c
===================================================================
--- trunk/sys/net/bpf.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/bpf.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -174,7 +174,7 @@
 static int bpf_zerocopy_enable = 0;
 SYSCTL_INT(_net_bpf, OID_AUTO, zerocopy_enable, CTLFLAG_RW,
     &bpf_zerocopy_enable, 0, "Enable new zero-copy BPF buffer sessions");
-SYSCTL_NODE(_net_bpf, OID_AUTO, stats, CTLFLAG_MPSAFE | CTLFLAG_RW,
+static SYSCTL_NODE(_net_bpf, OID_AUTO, stats, CTLFLAG_MPSAFE | CTLFLAG_RW,
     bpf_stats_sysctl, "bpf statistics portal");
 
 static VNET_DEFINE(int, bpf_optimize_writers) = 0;

Modified: trunk/sys/net/flowtable.c
===================================================================
--- trunk/sys/net/flowtable.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/flowtable.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -248,7 +248,8 @@
 #define	V_flowtable_nmbflows		VNET(flowtable_nmbflows)
 #define	V_flowtable_ready		VNET(flowtable_ready)
 
-SYSCTL_NODE(_net_inet, OID_AUTO, flowtable, CTLFLAG_RD, NULL, "flowtable");
+static SYSCTL_NODE(_net_inet, OID_AUTO, flowtable, CTLFLAG_RD, NULL,
+    "flowtable");
 SYSCTL_VNET_INT(_net_inet_flowtable, OID_AUTO, debug, CTLFLAG_RW,
     &VNET_NAME(flowtable_debug), 0, "print debug info.");
 SYSCTL_VNET_INT(_net_inet_flowtable, OID_AUTO, enable, CTLFLAG_RW,

Modified: trunk/sys/net/if_bridge.c
===================================================================
--- trunk/sys/net/if_bridge.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/if_bridge.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -348,7 +348,7 @@
 };
 
 SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, IFT_BRIDGE, bridge, CTLFLAG_RW, 0, "Bridge");
+static SYSCTL_NODE(_net_link, IFT_BRIDGE, bridge, CTLFLAG_RW, 0, "Bridge");
 
 static int pfil_onlyip = 1; /* only pass IP[46] packets when pfil is enabled */
 static int pfil_bridge = 1; /* run pfil hooks on the bridge interface */

Modified: trunk/sys/net/if_enc.c
===================================================================
--- trunk/sys/net/if_enc.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/if_enc.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -102,9 +102,9 @@
  * Before and after are relative to when we are stripping the
  * outer IP header.
  */
-SYSCTL_NODE(_net, OID_AUTO, enc, CTLFLAG_RW, 0, "enc sysctl");
+static SYSCTL_NODE(_net, OID_AUTO, enc, CTLFLAG_RW, 0, "enc sysctl");
 
-SYSCTL_NODE(_net_enc, OID_AUTO, in, CTLFLAG_RW, 0, "enc input sysctl");
+static SYSCTL_NODE(_net_enc, OID_AUTO, in, CTLFLAG_RW, 0, "enc input sysctl");
 static int ipsec_filter_mask_in = ENC_BEFORE;
 SYSCTL_INT(_net_enc_in, OID_AUTO, ipsec_filter_mask, CTLFLAG_RW,
 	&ipsec_filter_mask_in, 0, "IPsec input firewall filter mask");
@@ -112,7 +112,7 @@
 SYSCTL_INT(_net_enc_in, OID_AUTO, ipsec_bpf_mask, CTLFLAG_RW,
 	&ipsec_bpf_mask_in, 0, "IPsec input bpf mask");
 
-SYSCTL_NODE(_net_enc, OID_AUTO, out, CTLFLAG_RW, 0, "enc output sysctl");
+static SYSCTL_NODE(_net_enc, OID_AUTO, out, CTLFLAG_RW, 0, "enc output sysctl");
 static int ipsec_filter_mask_out = ENC_BEFORE;
 SYSCTL_INT(_net_enc_out, OID_AUTO, ipsec_filter_mask, CTLFLAG_RW,
 	&ipsec_filter_mask_out, 0, "IPsec output firewall filter mask");

Modified: trunk/sys/net/if_epair.c
===================================================================
--- trunk/sys/net/if_epair.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/if_epair.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -75,7 +75,7 @@
 #define	EPAIRNAME	"epair"
 
 SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, OID_AUTO, epair, CTLFLAG_RW, 0, "epair sysctl");
+static SYSCTL_NODE(_net_link, OID_AUTO, epair, CTLFLAG_RW, 0, "epair sysctl");
 
 #ifdef EPAIR_DEBUG
 static int epair_debug = 0;

Modified: trunk/sys/net/if_gif.c
===================================================================
--- trunk/sys/net/if_gif.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/if_gif.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -112,7 +112,7 @@
 static int gifmodevent(module_t, int, void *);
 
 SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, IFT_GIF, gif, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_net_link, IFT_GIF, gif, CTLFLAG_RW, 0,
     "Generic Tunnel Interface");
 #ifndef MAX_GIF_NEST
 /*

Modified: trunk/sys/net/if_gre.c
===================================================================
--- trunk/sys/net/if_gre.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/if_gre.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -148,7 +148,7 @@
 #endif
 
 SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, IFT_TUNNEL, gre, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_net_link, IFT_TUNNEL, gre, CTLFLAG_RW, 0,
     "Generic Routing Encapsulation");
 #ifndef MAX_GRE_NEST
 /*

Modified: trunk/sys/net/if_lagg.c
===================================================================
--- trunk/sys/net/if_lagg.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/if_lagg.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -166,7 +166,8 @@
 };
 
 SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, OID_AUTO, lagg, CTLFLAG_RW, 0, "Link Aggregation");
+static SYSCTL_NODE(_net_link, OID_AUTO, lagg, CTLFLAG_RW, 0,
+    "Link Aggregation");
 
 static int lagg_failover_rx_all = 0; /* Allow input on any failover links */
 SYSCTL_INT(_net_link_lagg, OID_AUTO, failover_rx_all, CTLFLAG_RW,

Modified: trunk/sys/net/if_mib.c
===================================================================
--- trunk/sys/net/if_mib.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/if_mib.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -63,7 +63,7 @@
  */
 
 SYSCTL_DECL(_net_link_generic);
-SYSCTL_NODE(_net_link_generic, IFMIB_SYSTEM, system, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_net_link_generic, IFMIB_SYSTEM, system, CTLFLAG_RW, 0,
 	    "Variables global to all interfaces");
 
 SYSCTL_VNET_INT(_net_link_generic_system, IFMIB_IFCOUNT, ifcount, CTLFLAG_RD,
@@ -164,6 +164,6 @@
 	return error;
 }
 
-SYSCTL_NODE(_net_link_generic, IFMIB_IFDATA, ifdata, CTLFLAG_RW,
+static SYSCTL_NODE(_net_link_generic, IFMIB_IFDATA, ifdata, CTLFLAG_RW,
 	    sysctl_ifdata, "Interface table");
 

Modified: trunk/sys/net/if_stf.c
===================================================================
--- trunk/sys/net/if_stf.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/if_stf.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -121,7 +121,7 @@
 #include <security/mac/mac_framework.h>
 
 SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, IFT_STF, stf, CTLFLAG_RW, 0, "6to4 Interface");
+static SYSCTL_NODE(_net_link, IFT_STF, stf, CTLFLAG_RW, 0, "6to4 Interface");
 
 static int stf_route_cache = 1;
 SYSCTL_INT(_net_link_stf, OID_AUTO, route_cache, CTLFLAG_RW,

Modified: trunk/sys/net/if_tap.c
===================================================================
--- trunk/sys/net/if_tap.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/if_tap.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -164,7 +164,7 @@
 SYSCTL_INT(_debug, OID_AUTO, if_tap_debug, CTLFLAG_RW, &tapdebug, 0, "");
 
 SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, OID_AUTO, tap, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_net_link, OID_AUTO, tap, CTLFLAG_RW, 0,
     "Ethernet tunnel software network interface");
 SYSCTL_INT(_net_link_tap, OID_AUTO, user_open, CTLFLAG_RW, &tapuopen, 0,
 	"Allow user to open /dev/tap (based on node permissions)");

Modified: trunk/sys/net/if_tun.c
===================================================================
--- trunk/sys/net/if_tun.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/if_tun.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -115,7 +115,7 @@
 SYSCTL_INT(_debug, OID_AUTO, if_tun_debug, CTLFLAG_RW, &tundebug, 0, "");
 
 SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, OID_AUTO, tun, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_net_link, OID_AUTO, tun, CTLFLAG_RW, 0,
     "IP tunnel software network interface.");
 SYSCTL_INT(_net_link_tun, OID_AUTO, devfs_cloning, CTLFLAG_RW, &tundclone, 0,
     "Enable legacy devfs interface creation.");

Modified: trunk/sys/net/if_vlan.c
===================================================================
--- trunk/sys/net/if_vlan.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/if_vlan.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -130,8 +130,10 @@
 };
 
 SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, IFT_L2VLAN, vlan, CTLFLAG_RW, 0, "IEEE 802.1Q VLAN");
-SYSCTL_NODE(_net_link_vlan, PF_LINK, link, CTLFLAG_RW, 0, "for consistency");
+static SYSCTL_NODE(_net_link, IFT_L2VLAN, vlan, CTLFLAG_RW, 0,
+    "IEEE 802.1Q VLAN");
+static SYSCTL_NODE(_net_link_vlan, PF_LINK, link, CTLFLAG_RW, 0,
+    "for consistency");
 
 static int soft_pad = 0;
 SYSCTL_INT(_net_link_vlan, OID_AUTO, soft_pad, CTLFLAG_RW, &soft_pad, 0,

Modified: trunk/sys/net/netisr.c
===================================================================
--- trunk/sys/net/netisr.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/netisr.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -124,7 +124,7 @@
 #define	NETISR_WUNLOCK()	rm_wunlock(&netisr_rmlock)
 /* #define	NETISR_LOCKING */
 
-SYSCTL_NODE(_net, OID_AUTO, isr, CTLFLAG_RW, 0, "netisr");
+static SYSCTL_NODE(_net, OID_AUTO, isr, CTLFLAG_RW, 0, "netisr");
 
 /*-
  * Three global direct dispatch policies are supported:

Modified: trunk/sys/net/raw_cb.c
===================================================================
--- trunk/sys/net/raw_cb.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/raw_cb.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -59,7 +59,8 @@
 struct mtx rawcb_mtx;
 VNET_DEFINE(struct rawcb_list_head, rawcb_list);
 
-SYSCTL_NODE(_net, OID_AUTO, raw, CTLFLAG_RW, 0, "Raw socket infrastructure");
+static SYSCTL_NODE(_net, OID_AUTO, raw, CTLFLAG_RW, 0,
+    "Raw socket infrastructure");
 
 static u_long	raw_sendspace = RAWSNDQ;
 SYSCTL_ULONG(_net_raw, OID_AUTO, sendspace, CTLFLAG_RW, &raw_sendspace, 0,

Modified: trunk/sys/net/rtsock.c
===================================================================
--- trunk/sys/net/rtsock.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net/rtsock.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -1972,7 +1972,7 @@
 	return (error);
 }
 
-SYSCTL_NODE(_net, PF_ROUTE, routetable, CTLFLAG_RD, sysctl_rtsock, "");
+static SYSCTL_NODE(_net, PF_ROUTE, routetable, CTLFLAG_RD, sysctl_rtsock, "");
 
 /*
  * Definitions of protocols supported in the ROUTE domain.

Modified: trunk/sys/net80211/ieee80211_hwmp.c
===================================================================
--- trunk/sys/net80211/ieee80211_hwmp.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net80211/ieee80211_hwmp.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -161,7 +161,7 @@
 	uint8_t			hs_maxhops;	/* max hop count */
 };
 
-SYSCTL_NODE(_net_wlan, OID_AUTO, hwmp, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_net_wlan, OID_AUTO, hwmp, CTLFLAG_RD, 0,
     "IEEE 802.11s HWMP parameters");
 static int	ieee80211_hwmp_targetonly = 0;
 SYSCTL_INT(_net_wlan_hwmp, OID_AUTO, targetonly, CTLTYPE_INT | CTLFLAG_RW,

Modified: trunk/sys/net80211/ieee80211_mesh.c
===================================================================
--- trunk/sys/net80211/ieee80211_mesh.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/net80211/ieee80211_mesh.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -97,7 +97,7 @@
 /*
  * Timeout values come from the specification and are in milliseconds.
  */
-SYSCTL_NODE(_net_wlan, OID_AUTO, mesh, CTLFLAG_RD, 0,
+static SYSCTL_NODE(_net_wlan, OID_AUTO, mesh, CTLFLAG_RD, 0,
     "IEEE 802.11s parameters");
 static int ieee80211_mesh_retrytimeout = -1;
 SYSCTL_PROC(_net_wlan_mesh, OID_AUTO, retrytimeout, CTLTYPE_INT | CTLFLAG_RW,

Modified: trunk/sys/netgraph/atm/ng_atm.c
===================================================================
--- trunk/sys/netgraph/atm/ng_atm.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netgraph/atm/ng_atm.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -75,7 +75,8 @@
 /*
  * Sysctl stuff.
  */
-SYSCTL_NODE(_net_graph, OID_AUTO, atm, CTLFLAG_RW, 0, "atm related stuff");
+static SYSCTL_NODE(_net_graph, OID_AUTO, atm, CTLFLAG_RW, 0,
+    "atm related stuff");
 
 #ifdef NGATM_DEBUG
 static int allow_shutdown;

Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -123,7 +123,7 @@
  
 /* Sysctl tree */
 SYSCTL_DECL(_net_bluetooth_hci_sockets);
-SYSCTL_NODE(_net_bluetooth_hci_sockets, OID_AUTO, raw, CTLFLAG_RW,
+static SYSCTL_NODE(_net_bluetooth_hci_sockets, OID_AUTO, raw, CTLFLAG_RW,
         0, "Bluetooth raw HCI sockets family");
 SYSCTL_UINT(_net_bluetooth_hci_sockets_raw, OID_AUTO, debug_level, CTLFLAG_RW,
         &ng_btsocket_hci_raw_debug_level, NG_BTSOCKET_WARN_LEVEL,

Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -111,7 +111,7 @@
 
 /* Sysctl tree */
 SYSCTL_DECL(_net_bluetooth_l2cap_sockets);
-SYSCTL_NODE(_net_bluetooth_l2cap_sockets, OID_AUTO, seq, CTLFLAG_RW,
+static SYSCTL_NODE(_net_bluetooth_l2cap_sockets, OID_AUTO, seq, CTLFLAG_RW,
 	0, "Bluetooth SEQPACKET L2CAP sockets family");
 SYSCTL_UINT(_net_bluetooth_l2cap_sockets_seq, OID_AUTO, debug_level,
 	CTLFLAG_RW,

Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -123,7 +123,7 @@
 
 /* Sysctl tree */
 SYSCTL_DECL(_net_bluetooth_l2cap_sockets);
-SYSCTL_NODE(_net_bluetooth_l2cap_sockets, OID_AUTO, raw, CTLFLAG_RW,
+static SYSCTL_NODE(_net_bluetooth_l2cap_sockets, OID_AUTO, raw, CTLFLAG_RW,
 	0, "Bluetooth raw L2CAP sockets family");
 SYSCTL_UINT(_net_bluetooth_l2cap_sockets_raw, OID_AUTO, debug_level,
 	CTLFLAG_RW,

Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -203,7 +203,7 @@
 
 /* Sysctl tree */
 SYSCTL_DECL(_net_bluetooth_rfcomm_sockets);
-SYSCTL_NODE(_net_bluetooth_rfcomm_sockets, OID_AUTO, stream, CTLFLAG_RW,
+static SYSCTL_NODE(_net_bluetooth_rfcomm_sockets, OID_AUTO, stream, CTLFLAG_RW,
 	0, "Bluetooth STREAM RFCOMM sockets family");
 SYSCTL_UINT(_net_bluetooth_rfcomm_sockets_stream, OID_AUTO, debug_level,
 	CTLFLAG_RW,

Modified: trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
===================================================================
--- trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -110,7 +110,7 @@
 
 /* Sysctl tree */
 SYSCTL_DECL(_net_bluetooth_sco_sockets);
-SYSCTL_NODE(_net_bluetooth_sco_sockets, OID_AUTO, seq, CTLFLAG_RW,
+static SYSCTL_NODE(_net_bluetooth_sco_sockets, OID_AUTO, seq, CTLFLAG_RW,
 	0, "Bluetooth SEQPACKET SCO sockets family");
 SYSCTL_UINT(_net_bluetooth_sco_sockets_seq, OID_AUTO, debug_level,
 	CTLFLAG_RW,

Modified: trunk/sys/netgraph/ng_socket.c
===================================================================
--- trunk/sys/netgraph/ng_socket.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netgraph/ng_socket.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -1180,8 +1180,8 @@
 VNET_DOMAIN_SET(ng);
 
 SYSCTL_INT(_net_graph, OID_AUTO, family, CTLFLAG_RD, 0, AF_NETGRAPH, "");
-SYSCTL_NODE(_net_graph, OID_AUTO, data, CTLFLAG_RW, 0, "DATA");
+static SYSCTL_NODE(_net_graph, OID_AUTO, data, CTLFLAG_RW, 0, "DATA");
 SYSCTL_INT(_net_graph_data, OID_AUTO, proto, CTLFLAG_RD, 0, NG_DATA, "");
-SYSCTL_NODE(_net_graph, OID_AUTO, control, CTLFLAG_RW, 0, "CONTROL");
+static SYSCTL_NODE(_net_graph, OID_AUTO, control, CTLFLAG_RW, 0, "CONTROL");
 SYSCTL_INT(_net_graph_control, OID_AUTO, proto, CTLFLAG_RD, 0, NG_CONTROL, "");
 

Modified: trunk/sys/netinet/accf_http.c
===================================================================
--- trunk/sys/netinet/accf_http.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet/accf_http.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -69,7 +69,7 @@
 
 static int parse_http_version = 1;
 
-SYSCTL_NODE(_net_inet_accf, OID_AUTO, http, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_net_inet_accf, OID_AUTO, http, CTLFLAG_RW, 0,
 "HTTP accept filter");
 SYSCTL_INT(_net_inet_accf_http, OID_AUTO, parsehttpversion, CTLFLAG_RW,
 &parse_http_version, 1,

Modified: trunk/sys/netinet/if_ether.c
===================================================================
--- trunk/sys/netinet/if_ether.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet/if_ether.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -77,8 +77,8 @@
 #define SDL(s) ((struct sockaddr_dl *)s)
 
 SYSCTL_DECL(_net_link_ether);
-SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, "");
-SYSCTL_NODE(_net_link_ether, PF_ARP, arp, CTLFLAG_RW, 0, "");
+static SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, "");
+static SYSCTL_NODE(_net_link_ether, PF_ARP, arp, CTLFLAG_RW, 0, "");
 
 /* timer values */
 static VNET_DEFINE(int, arpt_keep) = (20*60);	/* once resolved, good for 20

Modified: trunk/sys/netinet/igmp.c
===================================================================
--- trunk/sys/netinet/igmp.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet/igmp.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -280,8 +280,9 @@
 /*
  * Non-virtualized sysctls.
  */
-SYSCTL_NODE(_net_inet_igmp, OID_AUTO, ifinfo, CTLFLAG_RD | CTLFLAG_MPSAFE,
-    sysctl_igmp_ifinfo, "Per-interface IGMPv3 state");
+static SYSCTL_NODE(_net_inet_igmp, OID_AUTO, ifinfo,
+    CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_igmp_ifinfo,
+    "Per-interface IGMPv3 state");
 
 static __inline void
 igmp_save_context(struct mbuf *m, struct ifnet *ifp)

Modified: trunk/sys/netinet/in_mcast.c
===================================================================
--- trunk/sys/netinet/in_mcast.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet/in_mcast.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD: src/sys/netinet/in_mcast.c,v 1.5 2013/01/17 23:29:38 laffer1 Exp $");
+__MBSDID("$MidnightBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -155,7 +155,8 @@
 static int	inp_set_source_filters(struct inpcb *, struct sockopt *);
 static int	sysctl_ip_mcast_filters(SYSCTL_HANDLER_ARGS);
 
-SYSCTL_NODE(_net_inet_ip, OID_AUTO, mcast, CTLFLAG_RW, 0, "IPv4 multicast");
+static SYSCTL_NODE(_net_inet_ip, OID_AUTO, mcast, CTLFLAG_RW, 0,
+    "IPv4 multicast");
 
 static u_long in_mcast_maxgrpsrc = IP_MAX_GROUP_SRC_FILTER;
 SYSCTL_ULONG(_net_inet_ip_mcast, OID_AUTO, maxgrpsrc,
@@ -174,7 +175,7 @@
     &in_mcast_loop, 0, "Loopback multicast datagrams by default");
 TUNABLE_INT("net.inet.ip.mcast.loop", &in_mcast_loop);
 
-SYSCTL_NODE(_net_inet_ip_mcast, OID_AUTO, filters,
+static SYSCTL_NODE(_net_inet_ip_mcast, OID_AUTO, filters,
     CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_ip_mcast_filters,
     "Per-interface stack-wide source filters");
 

Modified: trunk/sys/netinet/in_pcb.c
===================================================================
--- trunk/sys/netinet/in_pcb.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet/in_pcb.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -162,7 +162,8 @@
 
 #undef RANGECHK
 
-SYSCTL_NODE(_net_inet_ip, IPPROTO_IP, portrange, CTLFLAG_RW, 0, "IP Ports");
+static SYSCTL_NODE(_net_inet_ip, IPPROTO_IP, portrange, CTLFLAG_RW, 0,
+    "IP Ports");
 
 SYSCTL_VNET_PROC(_net_inet_ip_portrange, OID_AUTO, lowfirst,
 	CTLTYPE_INT|CTLFLAG_RW, &VNET_NAME(ipport_lowfirstauto), 0,

Modified: trunk/sys/netinet/ip_divert.c
===================================================================
--- trunk/sys/netinet/ip_divert.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet/ip_divert.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -738,7 +738,8 @@
 }
 
 #ifdef SYSCTL_NODE
-SYSCTL_NODE(_net_inet, IPPROTO_DIVERT, divert, CTLFLAG_RW, 0, "IPDIVERT");
+static SYSCTL_NODE(_net_inet, IPPROTO_DIVERT, divert, CTLFLAG_RW, 0,
+    "IPDIVERT");
 SYSCTL_PROC(_net_inet_divert, OID_AUTO, pcblist, CTLTYPE_OPAQUE | CTLFLAG_RD,
     NULL, 0, div_pcblist, "S,xinpcb", "List of active divert sockets");
 #endif

Modified: trunk/sys/netinet/ip_mroute.c
===================================================================
--- trunk/sys/netinet/ip_mroute.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet/ip_mroute.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -2806,9 +2806,9 @@
 	return (error);
 }
 
-SYSCTL_NODE(_net_inet_ip, OID_AUTO, mfctable, CTLFLAG_RD, sysctl_mfctable,
-    "IPv4 Multicast Forwarding Table (struct *mfc[mfchashsize], "
-    "netinet/ip_mroute.h)");
+static SYSCTL_NODE(_net_inet_ip, OID_AUTO, mfctable, CTLFLAG_RD,
+    sysctl_mfctable, "IPv4 Multicast Forwarding Table "
+    "(struct *mfc[mfchashsize], netinet/ip_mroute.h)");
 
 static void
 vnet_mroute_init(const void *unused __unused)

Modified: trunk/sys/netinet/libalias/alias_sctp.c
===================================================================
--- trunk/sys/netinet/libalias/alias_sctp.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet/libalias/alias_sctp.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -364,8 +364,8 @@
 SYSCTL_DECL(_net_inet_ip);
 SYSCTL_DECL(_net_inet_ip_alias);
 
-SYSCTL_NODE(_net_inet_ip_alias, OID_AUTO, sctp, CTLFLAG_RW, NULL, "SCTP NAT");
-
+static SYSCTL_NODE(_net_inet_ip_alias, OID_AUTO, sctp, CTLFLAG_RW, NULL,
+    "SCTP NAT");
 SYSCTL_PROC(_net_inet_ip_alias_sctp, OID_AUTO, log_level, CTLTYPE_UINT | CTLFLAG_RW,
     &sysctl_log_level, 0, sysctl_chg_loglevel, "IU",
     "Level of detail (0 - default, 1 - event, 2 - info, 3 - detail, 4 - debug, 5 - max debug)");

Modified: trunk/sys/netinet/tcp_hostcache.c
===================================================================
--- trunk/sys/netinet/tcp_hostcache.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet/tcp_hostcache.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -118,7 +118,7 @@
 static void tcp_hc_purge_internal(int);
 static void tcp_hc_purge(void *);
 
-SYSCTL_NODE(_net_inet_tcp, OID_AUTO, hostcache, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_net_inet_tcp, OID_AUTO, hostcache, CTLFLAG_RW, 0,
     "TCP Host cache");
 
 SYSCTL_VNET_UINT(_net_inet_tcp_hostcache, OID_AUTO, cachelimit, CTLFLAG_RDTUN,

Modified: trunk/sys/netinet/tcp_reass.c
===================================================================
--- trunk/sys/netinet/tcp_reass.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet/tcp_reass.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -77,7 +77,7 @@
 static int tcp_reass_sysctl_maxseg(SYSCTL_HANDLER_ARGS);
 static int tcp_reass_sysctl_qsize(SYSCTL_HANDLER_ARGS);
 
-SYSCTL_NODE(_net_inet_tcp, OID_AUTO, reass, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_net_inet_tcp, OID_AUTO, reass, CTLFLAG_RW, 0,
     "TCP Segment Reassembly Queue");
 
 static int tcp_reass_maxseg = 0;

Modified: trunk/sys/netinet/tcp_syncache.c
===================================================================
--- trunk/sys/netinet/tcp_syncache.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet/tcp_syncache.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -147,7 +147,8 @@
 static VNET_DEFINE(struct tcp_syncache, tcp_syncache);
 #define	V_tcp_syncache			VNET(tcp_syncache)
 
-SYSCTL_NODE(_net_inet_tcp, OID_AUTO, syncache, CTLFLAG_RW, 0, "TCP SYN cache");
+static SYSCTL_NODE(_net_inet_tcp, OID_AUTO, syncache, CTLFLAG_RW, 0,
+    "TCP SYN cache");
 
 SYSCTL_VNET_UINT(_net_inet_tcp_syncache, OID_AUTO, bucketlimit, CTLFLAG_RDTUN,
     &VNET_NAME(tcp_syncache.bucket_limit), 0,

Modified: trunk/sys/netinet6/in6_mcast.c
===================================================================
--- trunk/sys/netinet6/in6_mcast.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet6/in6_mcast.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD: src/sys/netinet6/in6_mcast.c,v 1.2 2013/01/17 23:29:41 laffer1 Exp $");
+__MBSDID("$MidnightBSD$");
 
 #include "opt_inet6.h"
 
@@ -150,7 +150,8 @@
 
 SYSCTL_DECL(_net_inet6_ip6);	/* XXX Not in any common header. */
 
-SYSCTL_NODE(_net_inet6_ip6, OID_AUTO, mcast, CTLFLAG_RW, 0, "IPv6 multicast");
+static SYSCTL_NODE(_net_inet6_ip6, OID_AUTO, mcast, CTLFLAG_RW, 0,
+    "IPv6 multicast");
 
 static u_long in6_mcast_maxgrpsrc = IPV6_MAX_GROUP_SRC_FILTER;
 SYSCTL_ULONG(_net_inet6_ip6_mcast, OID_AUTO, maxgrpsrc,
@@ -170,7 +171,7 @@
     &in6_mcast_loop, 0, "Loopback multicast datagrams by default");
 TUNABLE_INT("net.inet6.ip6.mcast.loop", &in6_mcast_loop);
 
-SYSCTL_NODE(_net_inet6_ip6_mcast, OID_AUTO, filters,
+static SYSCTL_NODE(_net_inet6_ip6_mcast, OID_AUTO, filters,
     CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_ip6_mcast_filters,
     "Per-interface stack-wide source filters");
 

Modified: trunk/sys/netinet6/in6_src.c
===================================================================
--- trunk/sys/netinet6/in6_src.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet6/in6_src.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -965,7 +965,7 @@
 
 static int in6_src_sysctl(SYSCTL_HANDLER_ARGS);
 SYSCTL_DECL(_net_inet6_ip6);
-SYSCTL_NODE(_net_inet6_ip6, IPV6CTL_ADDRCTLPOLICY, addrctlpolicy,
+static SYSCTL_NODE(_net_inet6_ip6, IPV6CTL_ADDRCTLPOLICY, addrctlpolicy,
 	CTLFLAG_RD, in6_src_sysctl, "");
 
 static int

Modified: trunk/sys/netinet6/ip6_mroute.c
===================================================================
--- trunk/sys/netinet6/ip6_mroute.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet6/ip6_mroute.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -155,7 +155,7 @@
 
 SYSCTL_DECL(_net_inet6);
 SYSCTL_DECL(_net_inet6_ip6);
-SYSCTL_NODE(_net_inet6, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM");
+static SYSCTL_NODE(_net_inet6, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM");
 
 static struct mrt6stat mrt6stat;
 SYSCTL_STRUCT(_net_inet6_ip6, OID_AUTO, mrt6stat, CTLFLAG_RW,

Modified: trunk/sys/netinet6/mld6.c
===================================================================
--- trunk/sys/netinet6/mld6.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netinet6/mld6.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -232,8 +232,9 @@
 /*
  * Non-virtualized sysctls.
  */
-SYSCTL_NODE(_net_inet6_mld, OID_AUTO, ifinfo, CTLFLAG_RD | CTLFLAG_MPSAFE,
-    sysctl_mld_ifinfo, "Per-interface MLDv2 state");
+static SYSCTL_NODE(_net_inet6_mld, OID_AUTO, ifinfo,
+    CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_mld_ifinfo,
+    "Per-interface MLDv2 state");
 
 static int	mld_v1enable = 1;
 SYSCTL_INT(_net_inet6_mld, OID_AUTO, v1enable, CTLFLAG_RW,

Modified: trunk/sys/netipx/ipx_proto.c
===================================================================
--- trunk/sys/netipx/ipx_proto.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netipx/ipx_proto.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -156,4 +156,4 @@
 	"IPX/SPX");
 
 SYSCTL_NODE(_net_ipx,	IPXPROTO_RAW,	ipx,	CTLFLAG_RW, 0, "IPX");
-SYSCTL_NODE(_net_ipx,	IPXPROTO_SPX,	spx,	CTLFLAG_RW, 0, "SPX");
+static SYSCTL_NODE(_net_ipx, IPXPROTO_SPX, spx,	CTLFLAG_RW, 0, "SPX");

Modified: trunk/sys/netpfil/ipfw/ip_dn_io.c
===================================================================
--- trunk/sys/netpfil/ipfw/ip_dn_io.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/netpfil/ipfw/ip_dn_io.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -101,7 +101,7 @@
 
 SYSCTL_DECL(_net_inet);
 SYSCTL_DECL(_net_inet_ip);
-SYSCTL_NODE(_net_inet_ip, OID_AUTO, dummynet, CTLFLAG_RW, 0, "Dummynet");
+static SYSCTL_NODE(_net_inet_ip, OID_AUTO, dummynet, CTLFLAG_RW, 0, "Dummynet");
 
 /* wrapper to pass dn_cfg fields to SYSCTL_* */
 //#define DC(x)	(&(VNET_NAME(_base_dn_cfg).x))

Modified: trunk/sys/nlm/nlm_prot_impl.c
===================================================================
--- trunk/sys/nlm/nlm_prot_impl.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/nlm/nlm_prot_impl.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -84,8 +84,9 @@
 /*
  * Support for sysctl vfs.nlm.sysid
  */
-SYSCTL_NODE(_vfs, OID_AUTO, nlm, CTLFLAG_RW, NULL, "Network Lock Manager");
-SYSCTL_NODE(_vfs_nlm, OID_AUTO, sysid, CTLFLAG_RW, NULL, "");
+static SYSCTL_NODE(_vfs, OID_AUTO, nlm, CTLFLAG_RW, NULL,
+    "Network Lock Manager");
+static SYSCTL_NODE(_vfs_nlm, OID_AUTO, sysid, CTLFLAG_RW, NULL, "");
 
 /*
  * Syscall hooks

Modified: trunk/sys/security/audit/audit.c
===================================================================
--- trunk/sys/security/audit/audit.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/security/audit/audit.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -81,7 +81,7 @@
 MALLOC_DEFINE(M_AUDITTEXT, "audit_text", "Audit text storage");
 MALLOC_DEFINE(M_AUDITGIDSET, "audit_gidset", "Audit GID set storage");
 
-SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0,
     "TrustedBSD audit controls");
 
 /*

Modified: trunk/sys/security/mac_biba/mac_biba.c
===================================================================
--- trunk/sys/security/mac_biba/mac_biba.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/security/mac_biba/mac_biba.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -92,7 +92,7 @@
 
 SYSCTL_DECL(_security_mac);
 
-SYSCTL_NODE(_security_mac, OID_AUTO, biba, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security_mac, OID_AUTO, biba, CTLFLAG_RW, 0,
     "TrustedBSD mac_biba policy controls");
 
 static int	biba_label_size = sizeof(struct mac_biba);

Modified: trunk/sys/security/mac_bsdextended/mac_bsdextended.c
===================================================================
--- trunk/sys/security/mac_bsdextended/mac_bsdextended.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/security/mac_bsdextended/mac_bsdextended.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -72,7 +72,7 @@
 
 SYSCTL_DECL(_security_mac);
 
-SYSCTL_NODE(_security_mac, OID_AUTO, bsdextended, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security_mac, OID_AUTO, bsdextended, CTLFLAG_RW, 0,
     "TrustedBSD extended BSD MAC policy controls");
 
 static int	ugidfw_enabled = 1;
@@ -202,7 +202,7 @@
 	return (error);
 }
 
-SYSCTL_NODE(_security_mac_bsdextended, OID_AUTO, rules,
+static SYSCTL_NODE(_security_mac_bsdextended, OID_AUTO, rules,
     CTLFLAG_MPSAFE | CTLFLAG_RW, sysctl_rule, "BSD extended MAC rules");
 
 static void

Modified: trunk/sys/security/mac_ifoff/mac_ifoff.c
===================================================================
--- trunk/sys/security/mac_ifoff/mac_ifoff.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/security/mac_ifoff/mac_ifoff.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -59,7 +59,7 @@
 
 SYSCTL_DECL(_security_mac);
 
-SYSCTL_NODE(_security_mac, OID_AUTO, ifoff, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security_mac, OID_AUTO, ifoff, CTLFLAG_RW, 0,
     "TrustedBSD mac_ifoff policy controls");
 
 static int	ifoff_enabled = 1;

Modified: trunk/sys/security/mac_lomac/mac_lomac.c
===================================================================
--- trunk/sys/security/mac_lomac/mac_lomac.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/security/mac_lomac/mac_lomac.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -93,7 +93,7 @@
 
 SYSCTL_DECL(_security_mac);
 
-SYSCTL_NODE(_security_mac, OID_AUTO, lomac, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security_mac, OID_AUTO, lomac, CTLFLAG_RW, 0,
     "TrustedBSD mac_lomac policy controls");
 
 static int	lomac_label_size = sizeof(struct mac_lomac);

Modified: trunk/sys/security/mac_mls/mac_mls.c
===================================================================
--- trunk/sys/security/mac_mls/mac_mls.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/security/mac_mls/mac_mls.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -93,7 +93,7 @@
 
 SYSCTL_DECL(_security_mac);
 
-SYSCTL_NODE(_security_mac, OID_AUTO, mls, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security_mac, OID_AUTO, mls, CTLFLAG_RW, 0,
     "TrustedBSD mac_mls policy controls");
 
 static int	mls_label_size = sizeof(struct mac_mls);

Modified: trunk/sys/security/mac_partition/mac_partition.c
===================================================================
--- trunk/sys/security/mac_partition/mac_partition.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/security/mac_partition/mac_partition.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -65,7 +65,7 @@
 
 SYSCTL_DECL(_security_mac);
 
-SYSCTL_NODE(_security_mac, OID_AUTO, partition, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security_mac, OID_AUTO, partition, CTLFLAG_RW, 0,
     "TrustedBSD mac_partition policy controls");
 
 static int	partition_enabled = 1;

Modified: trunk/sys/security/mac_portacl/mac_portacl.c
===================================================================
--- trunk/sys/security/mac_portacl/mac_portacl.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/security/mac_portacl/mac_portacl.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -83,7 +83,7 @@
 
 SYSCTL_DECL(_security_mac);
 
-SYSCTL_NODE(_security_mac, OID_AUTO, portacl, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security_mac, OID_AUTO, portacl, CTLFLAG_RW, 0,
     "TrustedBSD mac_portacl policy controls");
 
 static int	portacl_enabled = 1;

Modified: trunk/sys/security/mac_seeotheruids/mac_seeotheruids.c
===================================================================
--- trunk/sys/security/mac_seeotheruids/mac_seeotheruids.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/security/mac_seeotheruids/mac_seeotheruids.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -63,7 +63,7 @@
 
 SYSCTL_DECL(_security_mac);
 
-SYSCTL_NODE(_security_mac, OID_AUTO, seeotheruids, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security_mac, OID_AUTO, seeotheruids, CTLFLAG_RW, 0,
     "TrustedBSD mac_seeotheruids policy controls");
 
 static int	seeotheruids_enabled = 1;

Modified: trunk/sys/security/mac_stub/mac_stub.c
===================================================================
--- trunk/sys/security/mac_stub/mac_stub.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/security/mac_stub/mac_stub.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -89,7 +89,7 @@
 
 SYSCTL_DECL(_security_mac);
 
-SYSCTL_NODE(_security_mac, OID_AUTO, stub, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security_mac, OID_AUTO, stub, CTLFLAG_RW, 0,
     "TrustedBSD mac_stub policy controls");
 
 static int	stub_enabled = 1;

Modified: trunk/sys/security/mac_test/mac_test.c
===================================================================
--- trunk/sys/security/mac_test/mac_test.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/security/mac_test/mac_test.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -80,7 +80,7 @@
 
 SYSCTL_DECL(_security_mac);
 
-SYSCTL_NODE(_security_mac, OID_AUTO, test, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security_mac, OID_AUTO, test, CTLFLAG_RW, 0,
     "TrustedBSD mac_test policy controls");
 
 #define	MAGIC_BPF	0xfe1ad1b6
@@ -112,7 +112,7 @@
 SYSCTL_INT(_security_mac_test, OID_AUTO, slot, CTLFLAG_RD,
     &test_slot, 0, "Slot allocated by framework");
 
-SYSCTL_NODE(_security_mac_test, OID_AUTO, counter, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_security_mac_test, OID_AUTO, counter, CTLFLAG_RW, 0,
     "TrustedBSD mac_test counters controls");
 
 #define	COUNTER_DECL(variable)						\

Modified: trunk/sys/ufs/ffs/ffs_softdep.c
===================================================================
--- trunk/sys/ufs/ffs/ffs_softdep.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/ufs/ffs/ffs_softdep.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -664,12 +664,13 @@
 unsigned long dep_write[D_LAST + 1];
 
 
-SYSCTL_NODE(_debug, OID_AUTO, softdep, CTLFLAG_RW, 0, "soft updates stats");
-SYSCTL_NODE(_debug_softdep, OID_AUTO, total, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_debug, OID_AUTO, softdep, CTLFLAG_RW, 0,
+    "soft updates stats");
+static SYSCTL_NODE(_debug_softdep, OID_AUTO, total, CTLFLAG_RW, 0,
     "total dependencies allocated");
-SYSCTL_NODE(_debug_softdep, OID_AUTO, current, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_debug_softdep, OID_AUTO, current, CTLFLAG_RW, 0,
     "current dependencies allocated");
-SYSCTL_NODE(_debug_softdep, OID_AUTO, write, CTLFLAG_RW, 0,
+static SYSCTL_NODE(_debug_softdep, OID_AUTO, write, CTLFLAG_RW, 0,
     "current dependencies written");
 
 #define	SOFTDEP_TYPE(type, str, long)					\

Modified: trunk/sys/vm/memguard.c
===================================================================
--- trunk/sys/vm/memguard.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/vm/memguard.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -58,7 +58,7 @@
 #include <vm/vm_extern.h>
 #include <vm/memguard.h>
 
-SYSCTL_NODE(_vm, OID_AUTO, memguard, CTLFLAG_RW, NULL, "MemGuard data");
+static SYSCTL_NODE(_vm, OID_AUTO, memguard, CTLFLAG_RW, NULL, "MemGuard data");
 /*
  * The vm_memguard_divisor variable controls how much of kmem_map should be
  * reserved for MemGuard.

Modified: trunk/sys/vm/redzone.c
===================================================================
--- trunk/sys/vm/redzone.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/vm/redzone.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -36,7 +36,7 @@
 #include <vm/redzone.h>
 
 
-SYSCTL_NODE(_vm, OID_AUTO, redzone, CTLFLAG_RW, NULL, "RedZone data");
+static SYSCTL_NODE(_vm, OID_AUTO, redzone, CTLFLAG_RW, NULL, "RedZone data");
 static u_long redzone_extra_mem = 0;
 SYSCTL_ULONG(_vm_redzone, OID_AUTO, extra_mem, CTLFLAG_RD, &redzone_extra_mem,
     0, "Extra memory allocated by redzone");     

Modified: trunk/sys/vm/vm_object.c
===================================================================
--- trunk/sys/vm/vm_object.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/vm/vm_object.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -140,7 +140,8 @@
 struct vm_object kernel_object_store;
 struct vm_object kmem_object_store;
 
-SYSCTL_NODE(_vm_stats, OID_AUTO, object, CTLFLAG_RD, 0, "VM object stats");
+static SYSCTL_NODE(_vm_stats, OID_AUTO, object, CTLFLAG_RD, 0,
+    "VM object stats");
 
 static long object_collapses;
 SYSCTL_LONG(_vm_stats_object, OID_AUTO, collapses, CTLFLAG_RD,

Modified: trunk/sys/x86/x86/busdma_machdep.c
===================================================================
--- trunk/sys/x86/x86/busdma_machdep.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/x86/x86/busdma_machdep.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -115,7 +115,7 @@
 static int busdma_zonecount;
 static STAILQ_HEAD(, bounce_zone) bounce_zone_list;
 
-SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters");
 SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0,
 	   "Total bounce pages");
 

Modified: trunk/sys/x86/x86/io_apic.c
===================================================================
--- trunk/sys/x86/x86/io_apic.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/x86/x86/io_apic.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -133,7 +133,7 @@
 static int next_ioapic_base;
 static u_int next_id;
 
-SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options");
+static SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options");
 static int enable_extint;
 SYSCTL_INT(_hw_apic, OID_AUTO, enable_extint, CTLFLAG_RDTUN, &enable_extint, 0,
     "Enable the ExtINT pin in the first I/O APIC");

Modified: trunk/sys/x86/x86/mca.c
===================================================================
--- trunk/sys/x86/x86/mca.c	2016-09-26 22:58:24 UTC (rev 8931)
+++ trunk/sys/x86/x86/mca.c	2016-09-26 23:02:42 UTC (rev 8932)
@@ -87,7 +87,8 @@
 static int mca_count;		/* Number of records stored. */
 static int mca_banks;		/* Number of per-CPU register banks. */
 
-SYSCTL_NODE(_hw, OID_AUTO, mca, CTLFLAG_RD, NULL, "Machine Check Architecture");
+static SYSCTL_NODE(_hw, OID_AUTO, mca, CTLFLAG_RD, NULL,
+    "Machine Check Architecture");
 
 static int mca_enabled = 1;
 TUNABLE_INT("hw.mca.enabled", &mca_enabled);



More information about the Midnightbsd-cvs mailing list