svn commit: r217368 - in head/sys: amd64/amd64 cam dev/ath dev/sound/pcm kern

[Matthew D Fleming]

Author: mdf
Date: Thu Jan 13 18:20:27 2011
New Revision: 217368
URL: http://svn.freebsd.org/changeset/base/217368

Log:
  Fix up a few more sysctl(9) mis-typing found in various LINT builds.

Modified:
  head/sys/amd64/amd64/mp_machdep.c
  head/sys/cam/cam_xpt.c
  head/sys/dev/ath/if_ath.c
  head/sys/dev/sound/pcm/buffer.c
  head/sys/kern/kern_ntptime.c

Modified: head/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- head/sys/amd64/amd64/mp_machdep.c	Thu Jan 13 18:20:19 2011	(r217367)
+++ head/sys/amd64/amd64/mp_machdep.c	Thu Jan 13 18:20:27 2011	(r217368)
@@ -1045,23 +1045,23 @@ u_int ipi_global;
 u_int ipi_page;
 u_int ipi_range;
 u_int ipi_range_size;
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_global, CTLFLAG_RW, &ipi_global, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_page, CTLFLAG_RW, &ipi_page, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_range, CTLFLAG_RW, &ipi_range, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_range_size, CTLFLAG_RW, &ipi_range_size,
-    0, "");
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_global, CTLFLAG_RW, &ipi_global, 0, "");
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_page, CTLFLAG_RW, &ipi_page, 0, "");
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_range, CTLFLAG_RW, &ipi_range, 0, "");
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_range_size, CTLFLAG_RW,
+    &ipi_range_size, 0, "");
 
 u_int ipi_masked_global;
 u_int ipi_masked_page;
 u_int ipi_masked_range;
 u_int ipi_masked_range_size;
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_global, CTLFLAG_RW,
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_global, CTLFLAG_RW,
     &ipi_masked_global, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_page, CTLFLAG_RW,
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_page, CTLFLAG_RW,
     &ipi_masked_page, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_range, CTLFLAG_RW,
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_range, CTLFLAG_RW,
     &ipi_masked_range, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_range_size, CTLFLAG_RW,
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_range_size, CTLFLAG_RW,
     &ipi_masked_range_size, 0, "");
 #endif /* COUNT_XINVLTLB_HITS */
 

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Thu Jan 13 18:20:19 2011	(r217367)
+++ head/sys/cam/cam_xpt.c	Thu Jan 13 18:20:27 2011	(r217368)
@@ -197,11 +197,11 @@ u_int32_t cam_dflags = CAM_DEBUG_FLAGS;
 u_int32_t cam_dflags = CAM_DEBUG_NONE;
 #endif
 TUNABLE_INT("kern.cam.dflags", &cam_dflags);
-SYSCTL_INT(_kern_cam, OID_AUTO, dflags, CTLFLAG_RW,
+SYSCTL_UINT(_kern_cam, OID_AUTO, dflags, CTLFLAG_RW,
 	&cam_dflags, 0, "Cam Debug Flags");
 u_int32_t cam_debug_delay;
 TUNABLE_INT("kern.cam.debug_delay", &cam_debug_delay);
-SYSCTL_INT(_kern_cam, OID_AUTO, debug_delay, CTLFLAG_RW,
+SYSCTL_UINT(_kern_cam, OID_AUTO, debug_delay, CTLFLAG_RW,
 	&cam_debug_delay, 0, "Cam Debug Flags");
 #endif
 

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Thu Jan 13 18:20:19 2011	(r217367)
+++ head/sys/dev/ath/if_ath.c	Thu Jan 13 18:20:27 2011	(r217368)
@@ -6648,17 +6648,17 @@ ath_sysctlattach(struct ath_softc *sc)
 #ifdef IEEE80211_SUPPORT_TDMA
 	if (ath_hal_macversion(ah) > 0x78) {
 		sc->sc_tdmadbaprep = 2;
-		SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
 			"dbaprep", CTLFLAG_RW, &sc->sc_tdmadbaprep, 0,
 			"TDMA DBA preparation time");
 		sc->sc_tdmaswbaprep = 10;
-		SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
 			"swbaprep", CTLFLAG_RW, &sc->sc_tdmaswbaprep, 0,
 			"TDMA SWBA preparation time");
-		SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
 			"guardtime", CTLFLAG_RW, &sc->sc_tdmaguard, 0,
 			"TDMA slot guard time");
-		SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+		SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
 			"superframe", CTLFLAG_RD, &sc->sc_tdmabintval, 0,
 			"TDMA calculated super frame");
 		SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,

Modified: head/sys/dev/sound/pcm/buffer.c
==============================================================================
--- head/sys/dev/sound/pcm/buffer.c	Thu Jan 13 18:20:19 2011	(r217367)
+++ head/sys/dev/sound/pcm/buffer.c	Thu Jan 13 18:20:27 2011	(r217368)
@@ -666,11 +666,11 @@ sndbuf_dispose(struct snd_dbuf *b, u_int
 
 #ifdef SND_DIAGNOSTIC
 static uint32_t snd_feeder_maxfeed = 0;
-SYSCTL_INT(_hw_snd, OID_AUTO, feeder_maxfeed, CTLFLAG_RD,
+SYSCTL_UINT(_hw_snd, OID_AUTO, feeder_maxfeed, CTLFLAG_RD,
     &snd_feeder_maxfeed, 0, "maximum feeder count request");
 
 static uint32_t snd_feeder_maxcycle = 0;
-SYSCTL_INT(_hw_snd, OID_AUTO, feeder_maxcycle, CTLFLAG_RD,
+SYSCTL_UINT(_hw_snd, OID_AUTO, feeder_maxcycle, CTLFLAG_RD,
     &snd_feeder_maxcycle, 0, "maximum feeder cycle");
 #endif
 

Modified: head/sys/kern/kern_ntptime.c
==============================================================================
--- head/sys/kern/kern_ntptime.c	Thu Jan 13 18:20:19 2011	(r217367)
+++ head/sys/kern/kern_ntptime.c	Thu Jan 13 18:20:27 2011	(r217368)
@@ -299,7 +299,8 @@ SYSCTL_PROC(_kern_ntp_pll, OID_AUTO, get
 #ifdef PPS_SYNC
 SYSCTL_INT(_kern_ntp_pll, OID_AUTO, pps_shiftmax, CTLFLAG_RW, &pps_shiftmax, 0, "");
 SYSCTL_INT(_kern_ntp_pll, OID_AUTO, pps_shift, CTLFLAG_RW, &pps_shift, 0, "");
-SYSCTL_INT(_kern_ntp_pll, OID_AUTO, time_monitor, CTLFLAG_RD, &time_monitor, 0, "");
+SYSCTL_LONG(_kern_ntp_pll, OID_AUTO, time_monitor, CTLFLAG_RD,
+    &time_monitor, 0, "");
 
 SYSCTL_OPAQUE(_kern_ntp_pll, OID_AUTO, pps_freq, CTLFLAG_RD, &pps_freq, sizeof(pps_freq), "I", "");
 SYSCTL_OPAQUE(_kern_ntp_pll, OID_AUTO, time_freq, CTLFLAG_RD, &time_freq, sizeof(time_freq), "I", "");