summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--share/examples/kld/dyn_sysctl/dyn_sysctl.c5
-rw-r--r--sys/compat/ndis/subr_ntoskrnl.c5
-rw-r--r--sys/dev/acpi_support/acpi_ibm.c2
-rw-r--r--sys/dev/acpi_support/atk0110.c2
-rw-r--r--sys/dev/acpica/acpi_video.c2
-rw-r--r--sys/dev/msk/if_msk.c2
-rw-r--r--sys/dev/patm/if_patm_attach.c8
-rw-r--r--sys/dev/xen/netback/netback.c4
-rw-r--r--sys/xen/xenbus/xenbusb.c10
9 files changed, 21 insertions, 19 deletions
diff --git a/share/examples/kld/dyn_sysctl/dyn_sysctl.c b/share/examples/kld/dyn_sysctl/dyn_sysctl.c
index 75d351b..5ed5e26 100644
--- a/share/examples/kld/dyn_sysctl/dyn_sysctl.c
+++ b/share/examples/kld/dyn_sysctl/dyn_sysctl.c
@@ -100,8 +100,9 @@ load(module_t mod, int cmd, void *arg)
return (EINVAL);
}
SYSCTL_ADD_PROC(&clist, SYSCTL_CHILDREN(a_root1),
- OID_AUTO, "procedure", CTLFLAG_RD, 0, 0,
- sysctl_dyn_sysctl_test, "A", "I can be here, too");
+ OID_AUTO, "procedure", CTLTYPE_STRING | CTLFLAG_RD,
+ NULL, 0, sysctl_dyn_sysctl_test, "A",
+ "I can be here, too");
printf(" (%p) /kern dyn_sysctl\n", &clist);
/* Overlap second tree with the first. */
diff --git a/sys/compat/ndis/subr_ntoskrnl.c b/sys/compat/ndis/subr_ntoskrnl.c
index 17016e0..6c449b1 100644
--- a/sys/compat/ndis/subr_ntoskrnl.c
+++ b/sys/compat/ndis/subr_ntoskrnl.c
@@ -80,8 +80,9 @@ __FBSDID("$FreeBSD$");
#ifdef NTOSKRNL_DEBUG_TIMERS
static int sysctl_show_timers(SYSCTL_HANDLER_ARGS);
-SYSCTL_PROC(_debug, OID_AUTO, ntoskrnl_timers, CTLFLAG_RW, 0, 0,
- sysctl_show_timers, "I", "Show ntoskrnl timer stats");
+SYSCTL_PROC(_debug, OID_AUTO, ntoskrnl_timers, CTLTYPE_INT | CTLFLAG_RW,
+ NULL, 0, sysctl_show_timers, "I",
+ "Show ntoskrnl timer stats");
#endif
struct kdpc_queue {
diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c
index d2be5dd..c8f3b45 100644
--- a/sys/dev/acpi_support/acpi_ibm.c
+++ b/sys/dev/acpi_support/acpi_ibm.c
@@ -399,7 +399,7 @@ acpi_ibm_attach(device_t dev)
if (acpi_ibm_sysctl_init(sc, ACPI_IBM_METHOD_THERMAL)) {
SYSCTL_ADD_PROC(sc->sysctl_ctx,
SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
- "thermal", CTLTYPE_STRING | CTLFLAG_RD,
+ "thermal", CTLTYPE_INT | CTLFLAG_RD,
sc, 0, acpi_ibm_thermal_sysctl, "I",
"Thermal zones");
}
diff --git a/sys/dev/acpi_support/atk0110.c b/sys/dev/acpi_support/atk0110.c
index 4e33c25e..363dcc7 100644
--- a/sys/dev/acpi_support/atk0110.c
+++ b/sys/dev/acpi_support/atk0110.c
@@ -258,7 +258,7 @@ aibs_attach_sif(struct aibs_softc *sc, enum aibs_type st)
#endif
snprintf(si, sizeof(si), "%i", i);
SYSCTL_ADD_PROC(device_get_sysctl_ctx(sc->sc_dev),
- SYSCTL_CHILDREN(so), i, si, CTLTYPE_OPAQUE | CTLFLAG_RD,
+ SYSCTL_CHILDREN(so), i, si, CTLTYPE_INT | CTLFLAG_RD,
sc, st, aibs_sysctl, st == AIBS_TEMP ? "IK" : "I", desc);
}
diff --git a/sys/dev/acpica/acpi_video.c b/sys/dev/acpica/acpi_video.c
index 933370c..f8133aa 100644
--- a/sys/dev/acpica/acpi_video.c
+++ b/sys/dev/acpica/acpi_video.c
@@ -537,7 +537,7 @@ acpi_video_vo_init(UINT32 adr)
SYSCTL_ADD_PROC(&vo->vo_sysctl_ctx,
SYSCTL_CHILDREN(vo->vo_sysctl_tree),
OID_AUTO, "levels",
- CTLTYPE_OPAQUE|CTLFLAG_RD, vo, 0,
+ CTLTYPE_INT | CTLFLAG_RD, vo, 0,
acpi_video_vo_levels_sysctl, "I",
"supported brightness levels");
} else
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
index 296115a..f84baa8 100644
--- a/sys/dev/msk/if_msk.c
+++ b/sys/dev/msk/if_msk.c
@@ -4389,7 +4389,7 @@ msk_sysctl_stat64(SYSCTL_HANDLER_ARGS)
sc, offsetof(struct msk_hw_stats, n), msk_sysctl_stat32, \
"IU", d)
#define MSK_SYSCTL_STAT64(sc, c, o, p, n, d) \
- SYSCTL_ADD_PROC(c, p, OID_AUTO, o, CTLTYPE_UINT | CTLFLAG_RD, \
+ SYSCTL_ADD_PROC(c, p, OID_AUTO, o, CTLTYPE_QUAD | CTLFLAG_RD, \
sc, offsetof(struct msk_hw_stats, n), msk_sysctl_stat64, \
"Q", d)
diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c
index 2e01d0f..a52af72 100644
--- a/sys/dev/patm/if_patm_attach.c
+++ b/sys/dev/patm/if_patm_attach.c
@@ -284,13 +284,13 @@ patm_attach(device_t dev)
patm_env_getuint(sc, &sc->debug, "debug");
if (SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree),
- OID_AUTO, "regs", CTLFLAG_RD, sc, 0, patm_sysctl_regs,
- "S", "registers") == NULL)
+ OID_AUTO, "regs", CTLTYPE_OPAQUE | CTLFLAG_RD, sc, 0,
+ patm_sysctl_regs, "S", "registers") == NULL)
goto fail;
if (SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree),
- OID_AUTO, "tsq", CTLFLAG_RD, sc, 0, patm_sysctl_tsq,
- "S", "TSQ") == NULL)
+ OID_AUTO, "tsq", CTLTYPE_OPAQUE | CTLFLAG_RD, sc, 0,
+ patm_sysctl_tsq, "S", "TSQ") == NULL)
goto fail;
#endif
diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c
index 3088ecb..f1af844 100644
--- a/sys/dev/xen/netback/netback.c
+++ b/sys/dev/xen/netback/netback.c
@@ -1511,11 +1511,11 @@ vif_attach(device_t dev)
"handle of frontend");
#ifdef XEN_NETBACK_DEBUG
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
- OID_AUTO, "txring", CTLFLAG_RD,
+ OID_AUTO, "txring", CTLTYPE_STRING | CTLFLAG_RD,
dev, VIF_SYSCTL_TXRING, vif_sysctl_handler, "A",
"tx ring info");
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
- OID_AUTO, "rxring", CTLFLAG_RD,
+ OID_AUTO, "rxring", CTLTYPE_STRING | CTLFLAG_RD,
dev, VIF_SYSCTL_RXRING, vif_sysctl_handler, "A",
"rx ring info");
#endif
diff --git a/sys/xen/xenbus/xenbusb.c b/sys/xen/xenbus/xenbusb.c
index 49facb6..4bc86aa 100644
--- a/sys/xen/xenbus/xenbusb.c
+++ b/sys/xen/xenbus/xenbusb.c
@@ -308,7 +308,7 @@ xenbusb_device_sysctl_init(device_t dev)
SYSCTL_CHILDREN(tree),
OID_AUTO,
"xenstore_path",
- CTLFLAG_RD,
+ CTLTYPE_STRING | CTLFLAG_RD,
dev,
XENBUS_IVAR_NODE,
xenbusb_device_sysctl_handler,
@@ -319,7 +319,7 @@ xenbusb_device_sysctl_init(device_t dev)
SYSCTL_CHILDREN(tree),
OID_AUTO,
"xenbus_dev_type",
- CTLFLAG_RD,
+ CTLTYPE_STRING | CTLFLAG_RD,
dev,
XENBUS_IVAR_TYPE,
xenbusb_device_sysctl_handler,
@@ -330,7 +330,7 @@ xenbusb_device_sysctl_init(device_t dev)
SYSCTL_CHILDREN(tree),
OID_AUTO,
"xenbus_connection_state",
- CTLFLAG_RD,
+ CTLTYPE_STRING | CTLFLAG_RD,
dev,
XENBUS_IVAR_STATE,
xenbusb_device_sysctl_handler,
@@ -341,7 +341,7 @@ xenbusb_device_sysctl_init(device_t dev)
SYSCTL_CHILDREN(tree),
OID_AUTO,
"xenbus_peer_domid",
- CTLFLAG_RD,
+ CTLTYPE_INT | CTLFLAG_RD,
dev,
XENBUS_IVAR_OTHEREND_ID,
xenbusb_device_sysctl_handler,
@@ -352,7 +352,7 @@ xenbusb_device_sysctl_init(device_t dev)
SYSCTL_CHILDREN(tree),
OID_AUTO,
"xenstore_peer_path",
- CTLFLAG_RD,
+ CTLTYPE_STRING | CTLFLAG_RD,
dev,
XENBUS_IVAR_OTHEREND_PATH,
xenbusb_device_sysctl_handler,
OpenPOWER on IntegriCloud