svn commit: r227309 - in head/sys: amd64/amd64 amd64/linux32 arm/arm arm/xscale/i80321 arm/xscale/i8134x arm/xscale/ixp425 cam/ata cam/scsi compat/ia32 compat/linux compat/x86bios dev/aac dev/acpic...

Ed Schouten ed at FreeBSD.org
Mon Nov 7 15:43:13 UTC 2011


Author: ed
Date: Mon Nov  7 15:43:11 2011
New Revision: 227309
URL: http://svn.freebsd.org/changeset/base/227309

Log:
  Mark all SYSCTL_NODEs static that have no corresponding SYSCTL_DECLs.
  
  The SYSCTL_NODE macro defines a list that stores all child-elements of
  that node. If there's no SYSCTL_DECL macro anywhere else, there's no
  reason why it shouldn't be static.

Modified:
  head/sys/amd64/amd64/mp_machdep.c
  head/sys/amd64/amd64/pmap.c
  head/sys/amd64/linux32/linux32_sysvec.c
  head/sys/arm/arm/busdma_machdep.c
  head/sys/arm/xscale/i80321/iq31244_7seg.c
  head/sys/arm/xscale/i8134x/iq81342_7seg.c
  head/sys/arm/xscale/ixp425/if_npe.c
  head/sys/cam/ata/ata_da.c
  head/sys/cam/ata/ata_pmp.c
  head/sys/cam/scsi/scsi_cd.c
  head/sys/cam/scsi/scsi_da.c
  head/sys/compat/ia32/ia32_sysvec.c
  head/sys/compat/linux/linux_mib.c
  head/sys/compat/x86bios/x86bios.c
  head/sys/dev/aac/aac.c
  head/sys/dev/acpica/acpi_ec.c
  head/sys/dev/acpica/acpi_smbat.c
  head/sys/dev/an/if_an.c
  head/sys/dev/ata/ata-all.c
  head/sys/dev/ath/ah_osdep.c
  head/sys/dev/atkbdc/psm.c
  head/sys/dev/bce/if_bce.c
  head/sys/dev/bge/if_bge.c
  head/sys/dev/bktr/bktr_os.c
  head/sys/dev/bwn/if_bwn.c
  head/sys/dev/bxe/if_bxe.c
  head/sys/dev/cardbus/cardbus.c
  head/sys/dev/cs/if_cs.c
  head/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c
  head/sys/dev/cxgbe/t4_main.c
  head/sys/dev/dcons/dcons_os.c
  head/sys/dev/e1000/if_em.c
  head/sys/dev/e1000/if_igb.c
  head/sys/dev/fb/vesa.c
  head/sys/dev/fdc/fdc.c
  head/sys/dev/firewire/fwmem.c
  head/sys/dev/firewire/if_fwe.c
  head/sys/dev/firewire/if_fwip.c
  head/sys/dev/firewire/sbp.c
  head/sys/dev/hifn/hifn7751.c
  head/sys/dev/ipmi/ipmi.c
  head/sys/dev/kbd/kbd.c
  head/sys/dev/malo/if_malo_pci.c
  head/sys/dev/mfi/mfi.c
  head/sys/dev/mmc/mmc.c
  head/sys/dev/mwl/mwlhal.c
  head/sys/dev/pccard/pccard.c
  head/sys/dev/pccbb/pccbb.c
  head/sys/dev/pccbb/pccbb_isa.c
  head/sys/dev/rndtest/rndtest.c
  head/sys/dev/rt/if_rt.c
  head/sys/dev/safe/safe.c
  head/sys/dev/sdhci/sdhci.c
  head/sys/dev/sound/midi/midi.c
  head/sys/dev/sound/pci/maestro.c
  head/sys/dev/sound/usb/uaudio.c
  head/sys/dev/syscons/syscons.c
  head/sys/dev/ubsec/ubsec.c
  head/sys/dev/usb/controller/at91dci.c
  head/sys/dev/usb/controller/atmegadci.c
  head/sys/dev/usb/controller/avr32dci.c
  head/sys/dev/usb/controller/ehci.c
  head/sys/dev/usb/controller/musb_otg.c
  head/sys/dev/usb/controller/ohci.c
  head/sys/dev/usb/controller/uhci.c
  head/sys/dev/usb/controller/usb_controller.c
  head/sys/dev/usb/controller/uss820dci.c
  head/sys/dev/usb/controller/xhci.c
  head/sys/dev/usb/input/atp.c
  head/sys/dev/usb/input/uep.c
  head/sys/dev/usb/input/uhid.c
  head/sys/dev/usb/input/ukbd.c
  head/sys/dev/usb/input/ums.c
  head/sys/dev/usb/misc/udbp.c
  head/sys/dev/usb/net/if_aue.c
  head/sys/dev/usb/net/if_axe.c
  head/sys/dev/usb/net/if_cdce.c
  head/sys/dev/usb/net/if_cue.c
  head/sys/dev/usb/net/if_ipheth.c
  head/sys/dev/usb/net/if_kue.c
  head/sys/dev/usb/net/if_mos.c
  head/sys/dev/usb/net/if_rue.c
  head/sys/dev/usb/net/if_udav.c
  head/sys/dev/usb/net/if_usie.c
  head/sys/dev/usb/net/uhso.c
  head/sys/dev/usb/net/usb_ethernet.c
  head/sys/dev/usb/serial/u3g.c
  head/sys/dev/usb/serial/ubsa.c
  head/sys/dev/usb/serial/ubser.c
  head/sys/dev/usb/serial/uchcom.c
  head/sys/dev/usb/serial/uftdi.c
  head/sys/dev/usb/serial/ulpt.c
  head/sys/dev/usb/serial/umcs.c
  head/sys/dev/usb/serial/umodem.c
  head/sys/dev/usb/serial/umoscom.c
  head/sys/dev/usb/serial/uplcom.c
  head/sys/dev/usb/serial/usb_serial.c
  head/sys/dev/usb/serial/uslcom.c
  head/sys/dev/usb/serial/uvisor.c
  head/sys/dev/usb/serial/uvscom.c
  head/sys/dev/usb/storage/umass.c
  head/sys/dev/usb/storage/urio.c
  head/sys/dev/usb/usb_dev.c
  head/sys/dev/usb/usb_generic.c
  head/sys/dev/usb/usb_hub.c
  head/sys/dev/usb/usb_process.c
  head/sys/dev/usb/wlan/if_rum.c
  head/sys/dev/usb/wlan/if_run.c
  head/sys/dev/usb/wlan/if_uath.c
  head/sys/dev/usb/wlan/if_upgt.c
  head/sys/dev/usb/wlan/if_ural.c
  head/sys/dev/usb/wlan/if_urtw.c
  head/sys/dev/usb/wlan/if_zyd.c
  head/sys/dev/wi/if_wi.c
  head/sys/dev/xe/if_xe.c
  head/sys/dev/xen/balloon/balloon.c
  head/sys/fs/ext2fs/ext2_alloc.c
  head/sys/fs/pseudofs/pseudofs_vncache.c
  head/sys/geom/cache/g_cache.c
  head/sys/geom/concat/g_concat.c
  head/sys/geom/gate/g_gate.c
  head/sys/geom/geom_disk.c
  head/sys/geom/journal/g_journal.c
  head/sys/geom/mirror/g_mirror.c
  head/sys/geom/mountver/g_mountver.c
  head/sys/geom/multipath/g_multipath.c
  head/sys/geom/nop/g_nop.c
  head/sys/geom/part/g_part.c
  head/sys/geom/raid/tr_raid1.c
  head/sys/geom/raid/tr_raid1e.c
  head/sys/geom/raid3/g_raid3.c
  head/sys/geom/sched/gs_rr.c
  head/sys/geom/shsec/g_shsec.c
  head/sys/geom/stripe/g_stripe.c
  head/sys/geom/vinum/geom_vinum.c
  head/sys/geom/virstor/g_virstor.c
  head/sys/geom/zero/g_zero.c
  head/sys/gnu/fs/xfs/FreeBSD/support/debug.c
  head/sys/i386/i386/mp_machdep.c
  head/sys/i386/i386/pmap.c
  head/sys/i386/xen/pmap.c
  head/sys/ia64/ia64/busdma_machdep.c
  head/sys/ia64/ia64/machdep.c
  head/sys/ia64/ia64/mca.c
  head/sys/ia64/ia64/pmap.c
  head/sys/kern/kern_clock.c
  head/sys/kern/kern_cpu.c
  head/sys/kern/kern_et.c
  head/sys/kern/kern_jail.c
  head/sys/kern/kern_ktr.c
  head/sys/kern/kern_lock.c
  head/sys/kern/kern_malloc.c
  head/sys/kern/kern_poll.c
  head/sys/kern/kern_rwlock.c
  head/sys/kern/kern_shutdown.c
  head/sys/kern/kern_sig.c
  head/sys/kern/kern_sx.c
  head/sys/kern/kern_tc.c
  head/sys/kern/kern_thr.c
  head/sys/kern/kern_umtx.c
  head/sys/kern/sched_4bsd.c
  head/sys/kern/subr_devstat.c
  head/sys/kern/subr_kdb.c
  head/sys/kern/subr_lock.c
  head/sys/kern/subr_prof.c
  head/sys/kern/subr_rman.c
  head/sys/kern/subr_sleepqueue.c
  head/sys/kern/subr_smp.c
  head/sys/kern/subr_turnstile.c
  head/sys/kern/subr_witness.c
  head/sys/kern/uipc_mqueue.c
  head/sys/kern/uipc_usrreq.c
  head/sys/kern/vfs_cache.c
  head/sys/mips/cavium/usb/octusb.c
  head/sys/mips/mips/busdma_machdep.c
  head/sys/net/bpf.c
  head/sys/net/flowtable.c
  head/sys/net/if_bridge.c
  head/sys/net/if_enc.c
  head/sys/net/if_epair.c
  head/sys/net/if_gif.c
  head/sys/net/if_gre.c
  head/sys/net/if_lagg.c
  head/sys/net/if_mib.c
  head/sys/net/if_stf.c
  head/sys/net/if_tap.c
  head/sys/net/if_tun.c
  head/sys/net/if_vlan.c
  head/sys/net/netisr.c
  head/sys/net/raw_cb.c
  head/sys/net/rtsock.c
  head/sys/net80211/ieee80211_hwmp.c
  head/sys/net80211/ieee80211_mesh.c
  head/sys/netgraph/atm/ng_atm.c
  head/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
  head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
  head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
  head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  head/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
  head/sys/netgraph/ng_socket.c
  head/sys/netinet/accf_http.c
  head/sys/netinet/if_ether.c
  head/sys/netinet/igmp.c
  head/sys/netinet/in_mcast.c
  head/sys/netinet/in_pcb.c
  head/sys/netinet/ip_divert.c
  head/sys/netinet/ip_mroute.c
  head/sys/netinet/ipfw/ip_dn_io.c
  head/sys/netinet/libalias/alias_sctp.c
  head/sys/netinet/tcp_hostcache.c
  head/sys/netinet/tcp_input.c
  head/sys/netinet/tcp_reass.c
  head/sys/netinet/tcp_syncache.c
  head/sys/netinet6/in6_mcast.c
  head/sys/netinet6/in6_src.c
  head/sys/netinet6/ip6_mroute.c
  head/sys/netinet6/mld6.c
  head/sys/netipx/ipx_proto.c
  head/sys/nlm/nlm_prot_impl.c
  head/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
  head/sys/powerpc/fpu/fpu_emu.c
  head/sys/powerpc/ofw/ofw_syscons.c
  head/sys/powerpc/powerpc/busdma_machdep.c
  head/sys/powerpc/ps3/ps3disk.c
  head/sys/security/audit/audit.c
  head/sys/security/mac_biba/mac_biba.c
  head/sys/security/mac_bsdextended/mac_bsdextended.c
  head/sys/security/mac_ifoff/mac_ifoff.c
  head/sys/security/mac_lomac/mac_lomac.c
  head/sys/security/mac_mls/mac_mls.c
  head/sys/security/mac_partition/mac_partition.c
  head/sys/security/mac_portacl/mac_portacl.c
  head/sys/security/mac_seeotheruids/mac_seeotheruids.c
  head/sys/security/mac_stub/mac_stub.c
  head/sys/security/mac_test/mac_test.c
  head/sys/sparc64/sparc64/identcpu.c
  head/sys/sparc64/sparc64/tick.c
  head/sys/ufs/ffs/ffs_softdep.c
  head/sys/vm/memguard.c
  head/sys/vm/redzone.c
  head/sys/vm/vm_object.c
  head/sys/x86/bios/vpd.c
  head/sys/x86/x86/busdma_machdep.c
  head/sys/x86/x86/io_apic.c
  head/sys/x86/x86/mca.c

Modified: head/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- head/sys/amd64/amd64/mp_machdep.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/amd64/amd64/mp_machdep.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -1049,7 +1049,7 @@ start_ap(int apic_id)
 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: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/amd64/amd64/pmap.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -182,7 +182,7 @@ static vm_paddr_t dmaplimit;
 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,
@@ -805,7 +805,7 @@ pmap_shpgperproc_proc(SYSCTL_HANDLER_ARG
 SYSCTL_PROC(_vm_pmap, OID_AUTO, shpgperproc, CTLTYPE_INT|CTLFLAG_RW, 
     &shpgperproc, 0, pmap_shpgperproc_proc, "IU", "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,
     "2MB page mapping counters");
 
 static u_long pmap_pde_demotions;
@@ -824,7 +824,7 @@ static u_long pmap_pde_promotions;
 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: head/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- head/sys/amd64/linux32/linux32_sysvec.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/amd64/linux32/linux32_sysvec.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -977,7 +977,7 @@ linux_copyout_strings(struct image_param
 	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: head/sys/arm/arm/busdma_machdep.c
==============================================================================
--- head/sys/arm/arm/busdma_machdep.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/arm/arm/busdma_machdep.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -126,7 +126,7 @@ static int total_bpages;
 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: head/sys/arm/xscale/i80321/iq31244_7seg.c
==============================================================================
--- head/sys/arm/xscale/i80321/iq31244_7seg.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/arm/xscale/i80321/iq31244_7seg.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -334,7 +334,7 @@ static const uint8_t snakemap[][2] = {
 	{ ~SEG_B,	~SEG_F },
 };
 
-SYSCTL_NODE(_hw, OID_AUTO, sevenseg, CTLFLAG_RD, 0, "7 seg");
+static SYSCTL_NODE(_hw, OID_AUTO, sevenseg, CTLFLAG_RD, 0, "7 seg");
 static int freq = 20;
 SYSCTL_INT(_hw_sevenseg, OID_AUTO, freq, CTLFLAG_RW, &freq, 0, 
     "7 Seg update frequency");

Modified: head/sys/arm/xscale/i8134x/iq81342_7seg.c
==============================================================================
--- head/sys/arm/xscale/i8134x/iq81342_7seg.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/arm/xscale/i8134x/iq81342_7seg.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -335,7 +335,7 @@ static const uint8_t snakemap[][2] = {
 	{ SEG_B,	SEG_F },
 };
 
-SYSCTL_NODE(_hw, OID_AUTO, sevenseg, CTLFLAG_RD, 0, "7 seg");
+static SYSCTL_NODE(_hw, OID_AUTO, sevenseg, CTLFLAG_RD, 0, "7 seg");
 static int freq = 20;
 SYSCTL_INT(_hw_sevenseg, OID_AUTO, freq, CTLFLAG_RW, &freq, 0, 
     "7 Seg update frequency");

Modified: head/sys/arm/xscale/ixp425/if_npe.c
==============================================================================
--- head/sys/arm/xscale/ixp425/if_npe.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/arm/xscale/ixp425/if_npe.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -250,7 +250,8 @@ static int	npe_setloopback(struct npe_so
 /* NB: all tx done processing goes through one queue */
 static int tx_doneqid = -1;
 
-SYSCTL_NODE(_hw, OID_AUTO, npe, CTLFLAG_RD, 0, "IXP4XX NPE driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, npe, CTLFLAG_RD, 0,
+    "IXP4XX NPE driver parameters");
 
 static int npe_debug = 0;
 SYSCTL_INT(_hw_npe, OID_AUTO, debug, CTLFLAG_RW, &npe_debug,

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/cam/ata/ata_da.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -327,7 +327,7 @@ static int ada_spindown_suspend = ADA_DE
 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: head/sys/cam/ata/ata_pmp.c
==============================================================================
--- head/sys/cam/ata/ata_pmp.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/cam/ata/ata_pmp.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -129,7 +129,7 @@ static	void		pmpdone(struct cam_periph *
 static int pmp_retry_count = PMP_DEFAULT_RETRY;
 static int pmp_default_timeout = PMP_DEFAULT_TIMEOUT;
 
-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: head/sys/cam/scsi/scsi_cd.c
==============================================================================
--- head/sys/cam/scsi/scsi_cd.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/cam/scsi/scsi_cd.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -306,8 +306,9 @@ static int cd_retry_count = CD_DEFAULT_R
 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: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/cam/scsi/scsi_da.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -606,7 +606,7 @@ static int da_retry_count = DA_DEFAULT_R
 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: head/sys/compat/ia32/ia32_sysvec.c
==============================================================================
--- head/sys/compat/ia32/ia32_sysvec.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/compat/ia32/ia32_sysvec.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -95,7 +95,7 @@ CTASSERT(sizeof(struct ia32_sigframe4) =
 
 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: head/sys/compat/linux/linux_mib.c
==============================================================================
--- head/sys/compat/linux/linux_mib.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/compat/linux/linux_mib.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -66,7 +66,7 @@ static struct linux_prison lprison0 = {
 
 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: head/sys/compat/x86bios/x86bios.c
==============================================================================
--- head/sys/compat/x86bios/x86bios.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/compat/x86bios/x86bios.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -67,7 +67,8 @@ __FBSDID("$FreeBSD$");
 
 static struct mtx x86bios_lock;
 
-SYSCTL_NODE(_debug, OID_AUTO, x86bios, CTLFLAG_RD, NULL, "x86bios debugging");
+static SYSCTL_NODE(_debug, OID_AUTO, x86bios, CTLFLAG_RD, NULL,
+    "x86bios debugging");
 static int x86bios_trace_call;
 TUNABLE_INT("debug.x86bios.call", &x86bios_trace_call);
 SYSCTL_INT(_debug_x86bios, OID_AUTO, call, CTLFLAG_RW, &x86bios_trace_call, 0,

Modified: head/sys/dev/aac/aac.c
==============================================================================
--- head/sys/dev/aac/aac.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/aac/aac.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -222,7 +222,7 @@ static struct cdevsw aac_cdevsw = {
 static 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: head/sys/dev/acpica/acpi_ec.c
==============================================================================
--- head/sys/dev/acpica/acpi_ec.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/acpica/acpi_ec.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -179,7 +179,7 @@ struct acpi_ec_softc {
 ACPI_SERIAL_DECL(ec, "ACPI embedded controller");
 
 SYSCTL_DECL(_debug_acpi);
-SYSCTL_NODE(_debug_acpi, OID_AUTO, ec, CTLFLAG_RD, NULL, "EC debugging");
+static SYSCTL_NODE(_debug_acpi, OID_AUTO, ec, CTLFLAG_RD, NULL, "EC debugging");
 
 static int	ec_burst_mode;
 TUNABLE_INT("debug.acpi.ec.burst", &ec_burst_mode);

Modified: head/sys/dev/acpica/acpi_smbat.c
==============================================================================
--- head/sys/dev/acpica/acpi_smbat.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/acpica/acpi_smbat.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -63,7 +63,8 @@ static int	acpi_smbat_get_bst(device_t d
 ACPI_SERIAL_DECL(smbat, "ACPI Smart Battery");
 
 SYSCTL_DECL(_debug_acpi);
-SYSCTL_NODE(_debug_acpi, OID_AUTO, batt, CTLFLAG_RD, NULL, "Battery debugging");
+static SYSCTL_NODE(_debug_acpi, OID_AUTO, batt, CTLFLAG_RD, NULL,
+    "Battery debugging");
 
 /* On some laptops with smart batteries, enabling battery monitoring
  * software causes keystrokes from atkbd to be lost.  This has also been

Modified: head/sys/dev/an/if_an.c
==============================================================================
--- head/sys/dev/an/if_an.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/an/if_an.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -203,7 +203,8 @@ static char an_conf_cache[256];
 
 /* 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: head/sys/dev/ata/ata-all.c
==============================================================================
--- head/sys/dev/ata/ata-all.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/ata/ata-all.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -103,7 +103,7 @@ static int ata_dma = 1;
 static int atapi_dma = 1;
 
 /* 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");
 TUNABLE_INT("hw.ata.ata_dma", &ata_dma);
 SYSCTL_INT(_hw_ata, OID_AUTO, ata_dma, CTLFLAG_RDTUN, &ata_dma, 0,
 	   "ATA disk DMA mode control");

Modified: head/sys/dev/ath/ah_osdep.c
==============================================================================
--- head/sys/dev/ath/ah_osdep.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/ath/ah_osdep.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -76,7 +76,8 @@ extern	void DO_HALDEBUG(struct ath_hal *
 
 /* NB: put this here instead of the driver to avoid circular references */
 SYSCTL_NODE(_hw, OID_AUTO, ath, CTLFLAG_RD, 0, "Atheros driver parameters");
-SYSCTL_NODE(_hw_ath, OID_AUTO, hal, CTLFLAG_RD, 0, "Atheros HAL parameters");
+static SYSCTL_NODE(_hw_ath, OID_AUTO, hal, CTLFLAG_RD, 0,
+    "Atheros HAL parameters");
 
 #ifdef AH_DEBUG
 int ath_hal_debug = 0;

Modified: head/sys/dev/atkbdc/psm.c
==============================================================================
--- head/sys/dev/atkbdc/psm.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/atkbdc/psm.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -2262,8 +2262,8 @@ psmtimeout(void *arg)
 }
 
 /* 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: head/sys/dev/bce/if_bce.c
==============================================================================
--- head/sys/dev/bce/if_bce.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/bce/if_bce.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -489,7 +489,7 @@ DRIVER_MODULE(miibus, bce, miibus_driver
 /****************************************************************************/
 /* 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: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/bge/if_bge.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -520,7 +520,7 @@ static int bge_allow_asf = 1;
 
 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: head/sys/dev/bktr/bktr_os.c
==============================================================================
--- head/sys/dev/bktr/bktr_os.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/bktr/bktr_os.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -108,7 +108,7 @@ int bt848_amsound = 0;		/* hard-wire AM 
 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: head/sys/dev/bwn/if_bwn.c
==============================================================================
--- head/sys/dev/bwn/if_bwn.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/bwn/if_bwn.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -73,7 +73,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/bwn/if_bwnreg.h>
 #include <dev/bwn/if_bwnvar.h>
 
-SYSCTL_NODE(_hw, OID_AUTO, bwn, CTLFLAG_RD, 0, "Broadcom driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, bwn, CTLFLAG_RD, 0,
+    "Broadcom driver parameters");
 
 /*
  * Tunable & sysctl variables.

Modified: head/sys/dev/bxe/if_bxe.c
==============================================================================
--- head/sys/dev/bxe/if_bxe.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/bxe/if_bxe.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -423,7 +423,7 @@ DRIVER_MODULE(bxe, pci, bxe_driver, bxe_
 /*
  * 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: head/sys/dev/cardbus/cardbus.c
==============================================================================
--- head/sys/dev/cardbus/cardbus.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/cardbus/cardbus.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #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: head/sys/dev/cs/if_cs.c
==============================================================================
--- head/sys/dev/cs/if_cs.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/cs/if_cs.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -103,7 +103,7 @@ devclass_t cs_devclass;
 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: head/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c
==============================================================================
--- head/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$");
 
 /* Avoid clutter in the hw.* space, keep all toe tunables within hw.cxgb */
 SYSCTL_DECL(_hw_cxgb);
-SYSCTL_NODE(_hw_cxgb, OID_AUTO, toe, CTLFLAG_RD, 0, "TOE parameters");
+static SYSCTL_NODE(_hw_cxgb, OID_AUTO, toe, CTLFLAG_RD, 0, "TOE parameters");
 
 static struct tom_tunables default_tunable_vals = {
 	.max_host_sndbuf = 32 * 1024,

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/cxgbe/t4_main.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -129,7 +129,8 @@ MALLOC_DEFINE(M_CXGBE, "cxgbe", "Chelsio
 /*
  * Tunables.
  */
-SYSCTL_NODE(_hw, OID_AUTO, cxgbe, CTLFLAG_RD, 0, "cxgbe driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, cxgbe, CTLFLAG_RD, 0,
+    "cxgbe driver parameters");
 
 static int force_firmware_install = 0;
 TUNABLE_INT("hw.cxgbe.force_firmware_install", &force_firmware_install);

Modified: head/sys/dev/dcons/dcons_os.c
==============================================================================
--- head/sys/dev/dcons/dcons_os.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/dcons/dcons_os.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -93,7 +93,7 @@ static int poll_hz = DCONS_POLL_HZ;
 
 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: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/e1000/if_em.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -330,7 +330,7 @@ MODULE_DEPEND(em, ether, 1, 1, 1);
 #define CSUM_TSO	0
 #endif
 
-SYSCTL_NODE(_hw, OID_AUTO, em, CTLFLAG_RD, 0, "EM driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, em, CTLFLAG_RD, 0, "EM driver parameters");
 
 static int em_tx_int_delay_dflt = EM_TICKS_TO_USECS(EM_TIDV);
 static int em_rx_int_delay_dflt = EM_TICKS_TO_USECS(EM_RDTR);

Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/e1000/if_igb.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -300,7 +300,7 @@ MODULE_DEPEND(igb, ether, 1, 1, 1);
  *  Tunable default values.
  *********************************************************************/
 
-SYSCTL_NODE(_hw, OID_AUTO, igb, CTLFLAG_RD, 0, "IGB driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, igb, CTLFLAG_RD, 0, "IGB driver parameters");
 
 /* Descriptor defaults */
 static int igb_rxd = IGB_DEFAULT_RXD;

Modified: head/sys/dev/fb/vesa.c
==============================================================================
--- head/sys/dev/fb/vesa.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/fb/vesa.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -95,7 +95,7 @@ static size_t vesa_bios_size = 0;
 /* VESA video adapter */
 static video_adapter_t *vesa_adp = NULL;
 
-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 = 0;
 TUNABLE_INT("debug.vesa.shadow_rom", &vesa_shadow_rom);
 SYSCTL_INT(_debug_vesa, OID_AUTO, shadow_rom, CTLFLAG_RDTUN, &vesa_shadow_rom,

Modified: head/sys/dev/fdc/fdc.c
==============================================================================
--- head/sys/dev/fdc/fdc.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/fdc/fdc.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -267,7 +267,7 @@ static driver_filter_t fdc_intr_fast;
 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: head/sys/dev/firewire/fwmem.c
==============================================================================
--- head/sys/dev/firewire/fwmem.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/firewire/fwmem.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
 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: head/sys/dev/firewire/if_fwe.c
==============================================================================
--- head/sys/dev/firewire/if_fwe.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/firewire/if_fwe.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -89,7 +89,7 @@ static int rx_queue_len = FWMAXQUEUE;
 static 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: head/sys/dev/firewire/if_fwip.c
==============================================================================
--- head/sys/dev/firewire/if_fwip.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/firewire/if_fwip.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -102,7 +102,7 @@ static int rx_queue_len = FWMAXQUEUE;
 static 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: head/sys/dev/firewire/sbp.c
==============================================================================
--- head/sys/dev/firewire/sbp.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/firewire/sbp.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -132,7 +132,8 @@ static int use_doorbell = 0;
 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: head/sys/dev/hifn/hifn7751.c
==============================================================================
--- head/sys/dev/hifn/hifn7751.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/hifn/hifn7751.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -184,7 +184,8 @@ READ_REG_1(struct hifn_softc *sc, bus_si
 }
 #define	WRITE_REG_1(sc, reg, val)	hifn_write_reg_1(sc, reg, val)
 
-SYSCTL_NODE(_hw, OID_AUTO, hifn, CTLFLAG_RD, 0, "Hifn driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, hifn, CTLFLAG_RD, 0,
+	    "Hifn driver parameters");
 
 #ifdef HIFN_DEBUG
 static	int hifn_debug = 0;

Modified: head/sys/dev/ipmi/ipmi.c
==============================================================================
--- head/sys/dev/ipmi/ipmi.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/ipmi/ipmi.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -63,7 +63,8 @@ static void ipmi_dtor(void *arg);
 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: head/sys/dev/kbd/kbd.c
==============================================================================
--- head/sys/dev/kbd/kbd.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/kbd/kbd.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -81,7 +81,7 @@ static keyboard_switch_t *kbdsw_ini;
        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: head/sys/dev/malo/if_malo_pci.c
==============================================================================
--- head/sys/dev/malo/if_malo_pci.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/malo/if_malo_pci.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -79,7 +79,7 @@ struct malo_pci_softc {
  * 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: head/sys/dev/mfi/mfi.c
==============================================================================
--- head/sys/dev/mfi/mfi.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/mfi/mfi.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -117,7 +117,7 @@ static int 	mfi_check_clear_intr_ppc(str
 static void 	mfi_issue_cmd_xscale(struct mfi_softc *sc,uint32_t bus_add,uint32_t frame_cnt);
 static void 	mfi_issue_cmd_ppc(struct mfi_softc *sc,uint32_t bus_add,uint32_t frame_cnt);
 
-SYSCTL_NODE(_hw, OID_AUTO, mfi, CTLFLAG_RD, 0, "MFI driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, mfi, CTLFLAG_RD, 0, "MFI driver parameters");
 static int	mfi_event_locale = MFI_EVT_LOCALE_ALL;
 TUNABLE_INT("hw.mfi.event_locale", &mfi_event_locale);
 SYSCTL_INT(_hw_mfi, OID_AUTO, event_locale, CTLFLAG_RW, &mfi_event_locale,

Modified: head/sys/dev/mmc/mmc.c
==============================================================================
--- head/sys/dev/mmc/mmc.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/mmc/mmc.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -105,7 +105,7 @@ struct mmc_ivars {
 
 #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: head/sys/dev/mwl/mwlhal.c
==============================================================================
--- head/sys/dev/mwl/mwlhal.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/mwl/mwlhal.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -190,7 +190,8 @@ static void dumpresult(struct mwl_hal_pr
 #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: head/sys/dev/pccard/pccard.c
==============================================================================
--- head/sys/dev/pccard/pccard.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/pccard/pccard.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
 #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: head/sys/dev/pccbb/pccbb.c
==============================================================================
--- head/sys/dev/pccbb/pccbb.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/pccbb/pccbb.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -129,7 +129,7 @@ __FBSDID("$FreeBSD$");
 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: head/sys/dev/pccbb/pccbb_isa.c
==============================================================================
--- head/sys/dev/pccbb/pccbb_isa.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/pccbb/pccbb_isa.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$");
  *****************************************************************************/
 
 /* 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: head/sys/dev/rndtest/rndtest.c
==============================================================================
--- head/sys/dev/rndtest/rndtest.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/rndtest/rndtest.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -70,8 +70,8 @@ static const struct rndtest_testfunc {
 
 #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: head/sys/dev/rt/if_rt.c
==============================================================================
--- head/sys/dev/rt/if_rt.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/rt/if_rt.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -136,7 +136,7 @@ static int	rt_miibus_writereg(device_t, 
 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: head/sys/dev/safe/safe.c
==============================================================================
--- head/sys/dev/safe/safe.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/safe/safe.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -147,7 +147,8 @@ static	void safe_totalreset(struct safe_
 
 static	int safe_free_entry(struct safe_softc *, struct safe_ringentry *);
 
-SYSCTL_NODE(_hw, OID_AUTO, safe, CTLFLAG_RD, 0, "SafeNet driver parameters");
+static SYSCTL_NODE(_hw, OID_AUTO, safe, CTLFLAG_RD, 0,
+    "SafeNet driver parameters");
 
 #ifdef SAFE_DEBUG
 static	void safe_dump_dmastatus(struct safe_softc *, const char *);

Modified: head/sys/dev/sdhci/sdhci.c
==============================================================================
--- head/sys/dev/sdhci/sdhci.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/sdhci/sdhci.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -154,7 +154,7 @@ struct sdhci_softc {
 	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: head/sys/dev/sound/midi/midi.c
==============================================================================
--- head/sys/dev/sound/midi/midi.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/sound/midi/midi.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -239,7 +239,7 @@ static int      midi_unload(void);
  * 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: head/sys/dev/sound/pci/maestro.c
==============================================================================
--- head/sys/dev/sound/pci/maestro.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/sound/pci/maestro.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -191,7 +191,7 @@ static unsigned int powerstate_init   = 
 /* 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: head/sys/dev/sound/usb/uaudio.c
==============================================================================
--- head/sys/dev/sound/usb/uaudio.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/sound/usb/uaudio.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -93,7 +93,7 @@ static int uaudio_default_channels = 0;	
 #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: head/sys/dev/syscons/syscons.c
==============================================================================
--- head/sys/dev/syscons/syscons.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/syscons/syscons.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -136,8 +136,8 @@ static	int		sc_no_suspend_vtswitch = 0;
 #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: head/sys/dev/ubsec/ubsec.c
==============================================================================
--- head/sys/dev/ubsec/ubsec.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/ubsec/ubsec.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -177,7 +177,8 @@ static	int ubsec_ksigbits(struct crparam
 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: head/sys/dev/usb/controller/at91dci.c
==============================================================================
--- head/sys/dev/usb/controller/at91dci.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/controller/at91dci.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -91,7 +91,7 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int at91dcidebug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, at91dci, CTLFLAG_RW, 0, "USB at91dci");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, at91dci, CTLFLAG_RW, 0, "USB at91dci");
 SYSCTL_INT(_hw_usb_at91dci, OID_AUTO, debug, CTLFLAG_RW,
     &at91dcidebug, 0, "at91dci debug level");
 #endif

Modified: head/sys/dev/usb/controller/atmegadci.c
==============================================================================
--- head/sys/dev/usb/controller/atmegadci.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/controller/atmegadci.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -83,7 +83,8 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int atmegadci_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, atmegadci, CTLFLAG_RW, 0,
+    "USB ATMEGA DCI");
 SYSCTL_INT(_hw_usb_atmegadci, OID_AUTO, debug, CTLFLAG_RW,
     &atmegadci_debug, 0, "ATMEGA DCI debug level");
 #endif

Modified: head/sys/dev/usb/controller/avr32dci.c
==============================================================================
--- head/sys/dev/usb/controller/avr32dci.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/controller/avr32dci.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -83,7 +83,7 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int avr32dci_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, avr32dci, CTLFLAG_RW, 0, "USB AVR32 DCI");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, avr32dci, CTLFLAG_RW, 0, "USB AVR32 DCI");
 SYSCTL_INT(_hw_usb_avr32dci, OID_AUTO, debug, CTLFLAG_RW,
     &avr32dci_debug, 0, "AVR32 DCI debug level");
 #endif

Modified: head/sys/dev/usb/controller/ehci.c
==============================================================================
--- head/sys/dev/usb/controller/ehci.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/controller/ehci.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -94,7 +94,7 @@ static int ehcinohighspeed = 0;
 static int ehciiaadbug = 0;
 static int ehcilostintrbug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci");
 SYSCTL_INT(_hw_usb_ehci, OID_AUTO, debug, CTLFLAG_RW,
     &ehcidebug, 0, "Debug level");
 SYSCTL_INT(_hw_usb_ehci, OID_AUTO, no_hs, CTLFLAG_RW,

Modified: head/sys/dev/usb/controller/musb_otg.c
==============================================================================
--- head/sys/dev/usb/controller/musb_otg.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/controller/musb_otg.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -85,7 +85,7 @@
 #ifdef USB_DEBUG
 static int musbotgdebug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, musbotg, CTLFLAG_RW, 0, "USB musbotg");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, musbotg, CTLFLAG_RW, 0, "USB musbotg");
 SYSCTL_INT(_hw_usb_musbotg, OID_AUTO, debug, CTLFLAG_RW,
     &musbotgdebug, 0, "Debug level");
 #endif

Modified: head/sys/dev/usb/controller/ohci.c
==============================================================================
--- head/sys/dev/usb/controller/ohci.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/controller/ohci.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int ohcidebug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci");
 SYSCTL_INT(_hw_usb_ohci, OID_AUTO, debug, CTLFLAG_RW,
     &ohcidebug, 0, "ohci debug level");
 

Modified: head/sys/dev/usb/controller/uhci.c
==============================================================================
--- head/sys/dev/usb/controller/uhci.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/controller/uhci.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -85,7 +85,7 @@ __FBSDID("$FreeBSD$");
 static int uhcidebug = 0;
 static int uhcinoloop = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, uhci, CTLFLAG_RW, 0, "USB uhci");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, uhci, CTLFLAG_RW, 0, "USB uhci");
 SYSCTL_INT(_hw_usb_uhci, OID_AUTO, debug, CTLFLAG_RW,
     &uhcidebug, 0, "uhci debug level");
 SYSCTL_INT(_hw_usb_uhci, OID_AUTO, loop, CTLFLAG_RW,

Modified: head/sys/dev/usb/controller/usb_controller.c
==============================================================================
--- head/sys/dev/usb/controller/usb_controller.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/controller/usb_controller.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -75,7 +75,7 @@ static void	usb_attach_sub(device_t, str
 #ifdef USB_DEBUG
 static int usb_ctrl_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, ctrl, CTLFLAG_RW, 0, "USB controller");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, ctrl, CTLFLAG_RW, 0, "USB controller");
 SYSCTL_INT(_hw_usb_ctrl, OID_AUTO, debug, CTLFLAG_RW, &usb_ctrl_debug, 0,
     "Debug level");
 #endif

Modified: head/sys/dev/usb/controller/uss820dci.c
==============================================================================
--- head/sys/dev/usb/controller/uss820dci.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/controller/uss820dci.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -79,7 +79,8 @@
 #ifdef USB_DEBUG
 static int uss820dcidebug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, uss820dci, CTLFLAG_RW, 0, "USB uss820dci");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, uss820dci, CTLFLAG_RW, 0,
+    "USB uss820dci");
 SYSCTL_INT(_hw_usb_uss820dci, OID_AUTO, debug, CTLFLAG_RW,
     &uss820dcidebug, 0, "uss820dci debug level");
 #endif

Modified: head/sys/dev/usb/controller/xhci.c
==============================================================================
--- head/sys/dev/usb/controller/xhci.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/controller/xhci.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -86,7 +86,7 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int xhcidebug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, xhci, CTLFLAG_RW, 0, "USB XHCI");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, xhci, CTLFLAG_RW, 0, "USB XHCI");
 SYSCTL_INT(_hw_usb_xhci, OID_AUTO, debug, CTLFLAG_RW,
     &xhcidebug, 0, "Debug level");
 

Modified: head/sys/dev/usb/input/atp.c
==============================================================================
--- head/sys/dev/usb/input/atp.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/input/atp.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -114,7 +114,7 @@ __FBSDID("$FreeBSD$");
 
 
 /* Tunables */
-SYSCTL_NODE(_hw_usb, OID_AUTO, atp, CTLFLAG_RW, 0, "USB atp");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, atp, CTLFLAG_RW, 0, "USB atp");
 
 #ifdef USB_DEBUG
 enum atp_log_level {

Modified: head/sys/dev/usb/input/uep.c
==============================================================================
--- head/sys/dev/usb/input/uep.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/input/uep.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -57,7 +57,7 @@
 #ifdef USB_DEBUG
 static int uep_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, uep, CTLFLAG_RW, 0, "USB uep");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, uep, CTLFLAG_RW, 0, "USB uep");
 SYSCTL_INT(_hw_usb_uep, OID_AUTO, debug, CTLFLAG_RW,
     &uep_debug, 0, "Debug level");
 #endif

Modified: head/sys/dev/usb/input/uhid.c
==============================================================================
--- head/sys/dev/usb/input/uhid.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/input/uhid.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int uhid_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid");
 SYSCTL_INT(_hw_usb_uhid, OID_AUTO, debug, CTLFLAG_RW,
     &uhid_debug, 0, "Debug level");
 #endif

Modified: head/sys/dev/usb/input/ukbd.c
==============================================================================
--- head/sys/dev/usb/input/ukbd.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/input/ukbd.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -93,7 +93,7 @@ __FBSDID("$FreeBSD$");
 static int ukbd_debug = 0;
 static int ukbd_no_leds = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, ukbd, CTLFLAG_RW, 0, "USB ukbd");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, ukbd, CTLFLAG_RW, 0, "USB ukbd");
 SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, debug, CTLFLAG_RW,
     &ukbd_debug, 0, "Debug level");
 SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, no_leds, CTLFLAG_RW,

Modified: head/sys/dev/usb/input/ums.c
==============================================================================
--- head/sys/dev/usb/input/ums.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/input/ums.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int ums_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums");
 SYSCTL_INT(_hw_usb_ums, OID_AUTO, debug, CTLFLAG_RW,
     &ums_debug, 0, "Debug level");
 #endif

Modified: head/sys/dev/usb/misc/udbp.c
==============================================================================
--- head/sys/dev/usb/misc/udbp.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/misc/udbp.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -96,7 +96,7 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int udbp_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, udbp, CTLFLAG_RW, 0, "USB udbp");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, udbp, CTLFLAG_RW, 0, "USB udbp");
 SYSCTL_INT(_hw_usb_udbp, OID_AUTO, debug, CTLFLAG_RW,
     &udbp_debug, 0, "udbp debug level");
 #endif

Modified: head/sys/dev/usb/net/if_aue.c
==============================================================================
--- head/sys/dev/usb/net/if_aue.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/if_aue.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -102,7 +102,7 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int aue_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue");
 SYSCTL_INT(_hw_usb_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0,
     "Debug level");
 #endif

Modified: head/sys/dev/usb/net/if_axe.c
==============================================================================
--- head/sys/dev/usb/net/if_axe.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/if_axe.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -133,7 +133,7 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int axe_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, axe, CTLFLAG_RW, 0, "USB axe");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, axe, CTLFLAG_RW, 0, "USB axe");
 SYSCTL_INT(_hw_usb_axe, OID_AUTO, debug, CTLFLAG_RW, &axe_debug, 0,
     "Debug level");
 #endif

Modified: head/sys/dev/usb/net/if_cdce.c
==============================================================================
--- head/sys/dev/usb/net/if_cdce.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/if_cdce.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -111,7 +111,7 @@ static uint32_t	cdce_m_crc32(struct mbuf
 static int cdce_debug = 0;
 static int cdce_tx_interval = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, cdce, CTLFLAG_RW, 0, "USB CDC-Ethernet");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, cdce, CTLFLAG_RW, 0, "USB CDC-Ethernet");
 SYSCTL_INT(_hw_usb_cdce, OID_AUTO, debug, CTLFLAG_RW, &cdce_debug, 0,
     "Debug level");
 SYSCTL_INT(_hw_usb_cdce, OID_AUTO, interval, CTLFLAG_RW, &cdce_tx_interval, 0,

Modified: head/sys/dev/usb/net/if_cue.c
==============================================================================
--- head/sys/dev/usb/net/if_cue.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/if_cue.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -124,7 +124,7 @@ static void	cue_reset(struct cue_softc *
 #ifdef USB_DEBUG
 static int cue_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, cue, CTLFLAG_RW, 0, "USB cue");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, cue, CTLFLAG_RW, 0, "USB cue");
 SYSCTL_INT(_hw_usb_cue, OID_AUTO, debug, CTLFLAG_RW, &cue_debug, 0,
     "Debug level");
 #endif

Modified: head/sys/dev/usb/net/if_ipheth.c
==============================================================================
--- head/sys/dev/usb/net/if_ipheth.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/if_ipheth.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -81,7 +81,7 @@ static uether_fn_t ipheth_setpromisc;
 #ifdef USB_DEBUG
 static int ipheth_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, ipheth, CTLFLAG_RW, 0, "USB iPhone ethernet");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, ipheth, CTLFLAG_RW, 0, "USB iPhone ethernet");
 SYSCTL_INT(_hw_usb_ipheth, OID_AUTO, debug, CTLFLAG_RW, &ipheth_debug, 0, "Debug level");
 #endif
 

Modified: head/sys/dev/usb/net/if_kue.c
==============================================================================
--- head/sys/dev/usb/net/if_kue.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/if_kue.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -165,7 +165,7 @@ static void	kue_reset(struct kue_softc *
 #ifdef USB_DEBUG
 static int kue_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, kue, CTLFLAG_RW, 0, "USB kue");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, kue, CTLFLAG_RW, 0, "USB kue");
 SYSCTL_INT(_hw_usb_kue, OID_AUTO, debug, CTLFLAG_RW, &kue_debug, 0,
     "Debug level");
 #endif

Modified: head/sys/dev/usb/net/if_mos.c
==============================================================================
--- head/sys/dev/usb/net/if_mos.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/if_mos.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -132,7 +132,7 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int mos_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, mos, CTLFLAG_RW, 0, "USB mos");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, mos, CTLFLAG_RW, 0, "USB mos");
 SYSCTL_INT(_hw_usb_mos, OID_AUTO, debug, CTLFLAG_RW, &mos_debug, 0,
     "Debug level");
 #endif

Modified: head/sys/dev/usb/net/if_rue.c
==============================================================================
--- head/sys/dev/usb/net/if_rue.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/if_rue.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -99,7 +99,7 @@ __FBSDID("$FreeBSD$");
 #ifdef USB_DEBUG
 static int rue_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, rue, CTLFLAG_RW, 0, "USB rue");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, rue, CTLFLAG_RW, 0, "USB rue");
 SYSCTL_INT(_hw_usb_rue, OID_AUTO, debug, CTLFLAG_RW,
     &rue_debug, 0, "Debug level");
 #endif

Modified: head/sys/dev/usb/net/if_udav.c
==============================================================================
--- head/sys/dev/usb/net/if_udav.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/if_udav.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -187,7 +187,7 @@ static const struct usb_ether_methods ud
 #ifdef USB_DEBUG
 static int udav_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, udav, CTLFLAG_RW, 0, "USB udav");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, udav, CTLFLAG_RW, 0, "USB udav");
 SYSCTL_INT(_hw_usb_udav, OID_AUTO, debug, CTLFLAG_RW, &udav_debug, 0,
     "Debug level");
 #endif

Modified: head/sys/dev/usb/net/if_usie.c
==============================================================================
--- head/sys/dev/usb/net/if_usie.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/if_usie.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
 #ifdef	USB_DEBUG
 static int usie_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, usie, CTLFLAG_RW, 0, "sierra USB modem");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, usie, CTLFLAG_RW, 0, "sierra USB modem");
 SYSCTL_INT(_hw_usb_usie, OID_AUTO, debug, CTLFLAG_RW, &usie_debug, 0,
     "usie debug level");
 #endif

Modified: head/sys/dev/usb/net/uhso.c
==============================================================================
--- head/sys/dev/usb/net/uhso.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/uhso.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -283,7 +283,7 @@ static const STRUCT_USB_HOST_ID uhso_dev
 #undef UHSO_DEV
 };
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, uhso, CTLFLAG_RW, 0, "USB uhso");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, uhso, CTLFLAG_RW, 0, "USB uhso");
 static int uhso_autoswitch = 1;
 SYSCTL_INT(_hw_usb_uhso, OID_AUTO, auto_switch, CTLFLAG_RW,
     &uhso_autoswitch, 0, "Automatically switch to modem mode");

Modified: head/sys/dev/usb/net/usb_ethernet.c
==============================================================================
--- head/sys/dev/usb/net/usb_ethernet.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/net/usb_ethernet.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -57,7 +57,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/usb_process.h>
 #include <dev/usb/net/usb_ethernet.h>
 
-SYSCTL_NODE(_net, OID_AUTO, ue, CTLFLAG_RD, 0, "USB Ethernet parameters");
+static SYSCTL_NODE(_net, OID_AUTO, ue, CTLFLAG_RD, 0,
+    "USB Ethernet parameters");
 
 #define	UE_LOCK(_ue)		mtx_lock((_ue)->ue_mtx)
 #define	UE_UNLOCK(_ue)		mtx_unlock((_ue)->ue_mtx)

Modified: head/sys/dev/usb/serial/u3g.c
==============================================================================
--- head/sys/dev/usb/serial/u3g.c	Mon Nov  7 14:22:18 2011	(r227308)
+++ head/sys/dev/usb/serial/u3g.c	Mon Nov  7 15:43:11 2011	(r227309)
@@ -66,7 +66,7 @@
 #ifdef USB_DEBUG
 static int u3g_debug = 0;
 
-SYSCTL_NODE(_hw_usb, OID_AUTO, u3g, CTLFLAG_RW, 0, "USB 3g");
+static SYSCTL_NODE(_hw_usb, OID_AUTO, u3g, CTLFLAG_RW, 0, "USB 3g");
 SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug, CTLFLAG_RW,
     &u3g_debug, 0, "Debug level");
 #endif

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-head mailing list