From owner-svn-src-all@FreeBSD.ORG Wed Jan 19 00:57:59 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 16A2C106566B; Wed, 19 Jan 2011 00:57:59 +0000 (UTC) (envelope-from mdf@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 02FEE8FC14; Wed, 19 Jan 2011 00:57:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0J0vwT0057718; Wed, 19 Jan 2011 00:57:58 GMT (envelope-from mdf@svn.freebsd.org) Received: (from mdf@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0J0vwLm057708; Wed, 19 Jan 2011 00:57:58 GMT (envelope-from mdf@svn.freebsd.org) Message-Id: <201101190057.p0J0vwLm057708@svn.freebsd.org> From: Matthew D Fleming Date: Wed, 19 Jan 2011 00:57:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217566 - in head: share/examples/kld/dyn_sysctl sys/compat/ndis sys/dev/acpi_support sys/dev/acpica sys/dev/msk sys/dev/patm sys/dev/xen/netback sys/xen/xenbus X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jan 2011 00:57:59 -0000 Author: mdf Date: Wed Jan 19 00:57:58 2011 New Revision: 217566 URL: http://svn.freebsd.org/changeset/base/217566 Log: Fix a few more SYSCTL_PROC() that were missing a CTLFLAG type specifier. Modified: head/share/examples/kld/dyn_sysctl/dyn_sysctl.c head/sys/compat/ndis/subr_ntoskrnl.c head/sys/dev/acpi_support/acpi_ibm.c head/sys/dev/acpi_support/atk0110.c head/sys/dev/acpica/acpi_video.c head/sys/dev/msk/if_msk.c head/sys/dev/patm/if_patm_attach.c head/sys/dev/xen/netback/netback.c head/sys/xen/xenbus/xenbusb.c Modified: head/share/examples/kld/dyn_sysctl/dyn_sysctl.c ============================================================================== --- head/share/examples/kld/dyn_sysctl/dyn_sysctl.c Tue Jan 18 23:35:08 2011 (r217565) +++ head/share/examples/kld/dyn_sysctl/dyn_sysctl.c Wed Jan 19 00:57:58 2011 (r217566) @@ -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. */ Modified: head/sys/compat/ndis/subr_ntoskrnl.c ============================================================================== --- head/sys/compat/ndis/subr_ntoskrnl.c Tue Jan 18 23:35:08 2011 (r217565) +++ head/sys/compat/ndis/subr_ntoskrnl.c Wed Jan 19 00:57:58 2011 (r217566) @@ -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 { Modified: head/sys/dev/acpi_support/acpi_ibm.c ============================================================================== --- head/sys/dev/acpi_support/acpi_ibm.c Tue Jan 18 23:35:08 2011 (r217565) +++ head/sys/dev/acpi_support/acpi_ibm.c Wed Jan 19 00:57:58 2011 (r217566) @@ -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"); } Modified: head/sys/dev/acpi_support/atk0110.c ============================================================================== --- head/sys/dev/acpi_support/atk0110.c Tue Jan 18 23:35:08 2011 (r217565) +++ head/sys/dev/acpi_support/atk0110.c Wed Jan 19 00:57:58 2011 (r217566) @@ -258,7 +258,7 @@ aibs_attach_sif(struct aibs_softc *sc, e #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); } Modified: head/sys/dev/acpica/acpi_video.c ============================================================================== --- head/sys/dev/acpica/acpi_video.c Tue Jan 18 23:35:08 2011 (r217565) +++ head/sys/dev/acpica/acpi_video.c Wed Jan 19 00:57:58 2011 (r217566) @@ -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 Modified: head/sys/dev/msk/if_msk.c ============================================================================== --- head/sys/dev/msk/if_msk.c Tue Jan 18 23:35:08 2011 (r217565) +++ head/sys/dev/msk/if_msk.c Wed Jan 19 00:57:58 2011 (r217566) @@ -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) Modified: head/sys/dev/patm/if_patm_attach.c ============================================================================== --- head/sys/dev/patm/if_patm_attach.c Tue Jan 18 23:35:08 2011 (r217565) +++ head/sys/dev/patm/if_patm_attach.c Wed Jan 19 00:57:58 2011 (r217566) @@ -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 Modified: head/sys/dev/xen/netback/netback.c ============================================================================== --- head/sys/dev/xen/netback/netback.c Tue Jan 18 23:35:08 2011 (r217565) +++ head/sys/dev/xen/netback/netback.c Wed Jan 19 00:57:58 2011 (r217566) @@ -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 Modified: head/sys/xen/xenbus/xenbusb.c ============================================================================== --- head/sys/xen/xenbus/xenbusb.c Tue Jan 18 23:35:08 2011 (r217565) +++ head/sys/xen/xenbus/xenbusb.c Wed Jan 19 00:57:58 2011 (r217566) @@ -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,