Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Ensure that the top level sysctl nodes (kern, vfs, net, ...



details:   https://anonhg.NetBSD.org/src/rev/50e7e4f14a69
branches:  trunk
changeset: 327009:50e7e4f14a69
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Feb 25 18:30:08 2014 +0000

description:
Ensure that the top level sysctl nodes (kern, vfs, net, ...) exist before
the sysctl link sets are processed, and remove redundancy.

Shaves >13kB off of an amd64 GENERIC, not to mention >1k duplicate
lines of code.

diffstat:

 sys/arch/arm/arm32/arm32_machdep.c              |   9 +----
 sys/arch/evbarm/tsarm/toastersensors.c          |  12 +------
 sys/arch/evbarm/tsarm/tspld.c                   |  12 +------
 sys/arch/evbppc/obs405/dev/obsled.c             |  13 +-------
 sys/arch/hpcarm/dev/j720tp.c                    |  11 +-----
 sys/arch/sparc64/dev/lom.c                      |  24 +++------------
 sys/arch/x86/acpi/acpi_wakeup.c                 |  15 ++-------
 sys/coda/coda_vfsops.c                          |  10 +----
 sys/compat/freebsd/freebsd_sysctl.c             |   9 +----
 sys/compat/linux/common/linux_sysctl.c          |   9 +----
 sys/compat/linux32/common/linux32_sysctl.c      |   9 +----
 sys/ddb/db_variables.c                          |  10 +-----
 sys/dev/acpi/acpi.c                             |  14 +-------
 sys/dev/acpi/acpi_cpu.c                         |  13 +------
 sys/dev/acpi/acpi_debug.c                       |  14 +-------
 sys/dev/acpi/acpi_display.c                     |  20 ++----------
 sys/dev/acpi/acpi_power.c                       |  14 +-------
 sys/dev/acpi/acpi_wakedev.c                     |  14 +-------
 sys/dev/acpi/asus_acpi.c                        |   8 +---
 sys/dev/acpi/fujbp_acpi.c                       |  12 +-----
 sys/dev/acpi/fujhk_acpi.c                       |  12 +-----
 sys/dev/acpi/sony_acpi.c                        |  12 ++-----
 sys/dev/acpi/wmi/wmi_hp.c                       |  13 +------
 sys/dev/bluetooth/bcsp.c                        |   9 +----
 sys/dev/bluetooth/btmagic.c                     |  12 +------
 sys/dev/ccd.c                                   |  10 +-----
 sys/dev/firmload.c                              |  11 +-----
 sys/dev/flash/flash_io.c                        |  10 +-----
 sys/dev/gpio/gpiopwm.c                          |   7 +---
 sys/dev/gpio/gpiosim.c                          |   7 +---
 sys/dev/i2c/dbcool.c                            |  17 +---------
 sys/dev/i2c/tps65950.c                          |  11 +-----
 sys/dev/ic/an.c                                 |  11 +-----
 sys/dev/ic/ath_netbsd.c                         |  18 ++---------
 sys/dev/ic/bwi.c                                |  18 ++---------
 sys/dev/ic/rtw.c                                |  11 +-----
 sys/dev/ic/spdmem.c                             |  33 +++-----------------
 sys/dev/ic/wi.c                                 |  11 +-----
 sys/dev/ieee1394/firewire.c                     |  10 +-----
 sys/dev/ieee1394/fwmem.c                        |  10 +-----
 sys/dev/ieee1394/fwohci.c                       |  10 +-----
 sys/dev/ieee1394/if_fwip.c                      |  10 +-----
 sys/dev/ieee1394/sbp.c                          |   9 +----
 sys/dev/isa/toaster.c                           |  11 +-----
 sys/dev/keylock.c                               |   7 +---
 sys/dev/marvell/if_mvgbe.c                      |  10 +-----
 sys/dev/nor/nor.c                               |  10 +-----
 sys/dev/pci/auich.c                             |   9 +----
 sys/dev/pci/if_bge.c                            |  10 +-----
 sys/dev/pci/if_ipw.c                            |  14 +-------
 sys/dev/pci/if_iwi.c                            |  28 +++---------------
 sys/dev/pci/if_jme.c                            |  10 +-----
 sys/dev/pci/if_msk.c                            |  10 +-----
 sys/dev/pci/if_sk.c                             |  10 +-----
 sys/dev/pci/if_vte.c                            |  10 +-----
 sys/dev/pci/if_wpi.c                            |  11 +-----
 sys/dev/pci/ixgbe/ixgbe.c                       |   9 +----
 sys/dev/pci/twa.c                               |  12 +------
 sys/dev/pci/twe.c                               |  12 +------
 sys/dev/pci/ubsec.c                             |   9 +----
 sys/dev/pckbport/elantech.c                     |   9 +----
 sys/dev/pckbport/synaptics.c                    |   9 +----
 sys/dev/usb/uatp.c                              |  14 +-------
 sys/dev/usb/ubt.c                               |  20 +-----------
 sys/dev/usb/uhso.c                              |  12 +------
 sys/fs/adosfs/advfsops.c                        |   9 +----
 sys/fs/cd9660/cd9660_vfsops.c                   |   8 +---
 sys/fs/filecorefs/filecore_vfsops.c             |   9 +----
 sys/fs/msdosfs/msdosfs_vfsops.c                 |   9 +----
 sys/fs/nilfs/nilfs_vfsops.c                     |   9 +----
 sys/fs/ntfs/ntfs_vfsops.c                       |   9 +----
 sys/fs/ptyfs/ptyfs_vfsops.c                     |   9 +----
 sys/fs/smbfs/smbfs_vfsops.c                     |   9 +----
 sys/fs/udf/udf_vfsops.c                         |   9 +----
 sys/fs/union/union_vfsops.c                     |   9 +----
 sys/fs/unionfs/unionfs_vfsops.c                 |   5 ---
 sys/kern/init_sysctl.c                          |  22 +-------------
 sys/kern/init_sysctl_base.c                     |  38 +++++++++++-------------
 sys/kern/kern_descrip.c                         |   7 +---
 sys/kern/kern_module.c                          |   9 +----
 sys/kern/kern_ntptime.c                         |  10 +-----
 sys/kern/kern_pax.c                             |  14 ++------
 sys/kern/kern_proc.c                            |  10 +-----
 sys/kern/kern_resource.c                        |   9 +----
 sys/kern/kern_runq.c                            |   9 +----
 sys/kern/kern_sysctl.c                          |   5 +-
 sys/kern/kern_verifiedexec.c                    |  12 +-----
 sys/kern/sched_4bsd.c                           |   9 +----
 sys/kern/sched_m2.c                             |   9 +----
 sys/kern/subr_autoconf.c                        |  20 +++---------
 sys/kern/subr_bufq.c                            |   9 +----
 sys/kern/subr_evcnt.c                           |  10 +----
 sys/kern/subr_iostat.c                          |  10 +-----
 sys/kern/subr_prof.c                            |   9 +----
 sys/kern/subr_syscall_stats.c                   |   9 +----
 sys/kern/sys_aio.c                              |  13 +-------
 sys/kern/sys_mqueue.c                           |   9 +----
 sys/kern/sys_pipe.c                             |   9 +----
 sys/kern/sys_pset.c                             |   9 +----
 sys/kern/sys_sched.c                            |   9 +----
 sys/kern/sys_select.c                           |  14 ++------
 sys/kern/sysv_ipc.c                             |   9 +----
 sys/kern/sysv_msg.c                             |   9 +----
 sys/kern/sysv_sem.c                             |   9 +----
 sys/kern/sysv_shm.c                             |   9 +----
 sys/kern/tty.c                                  |   9 +----
 sys/kern/uipc_accf.c                            |   9 +----
 sys/kern/uipc_domain.c                          |   9 +----
 sys/kern/uipc_mbuf.c                            |   9 +----
 sys/kern/uipc_socket.c                          |   9 +----
 sys/kern/vfs_bio.c                              |  14 +-------
 sys/kern/vfs_init.c                             |   9 +----
 sys/kern/vfs_wapbl.c                            |  14 +-------
 sys/miscfs/fdesc/fdesc_vfsops.c                 |   9 +----
 sys/miscfs/genfs/layer_vfsops.c                 |  15 +-------
 sys/miscfs/kernfs/kernfs_vfsops.c               |   9 +----
 sys/miscfs/nullfs/null_vfsops.c                 |   9 +----
 sys/miscfs/overlay/overlay_vfsops.c             |   8 +---
 sys/miscfs/procfs/procfs_vfsops.c               |   9 +----
 sys/miscfs/syncfs/sync_subr.c                   |  12 +-----
 sys/miscfs/umapfs/umap_vfsops.c                 |   9 +----
 sys/modules/lua/lua.c                           |   7 +---
 sys/net/bpf.c                                   |  10 +-----
 sys/net/if.c                                    |  18 +---------
 sys/net/if_etherip.c                            |  12 +------
 sys/net/if_tap.c                                |  11 +-----
 sys/net/route.c                                 |  10 +----
 sys/net/rtsock.c                                |  10 +-----
 sys/net80211/ieee80211_netbsd.c                 |  11 +-----
 sys/net80211/ieee80211_rssadapt.c               |  11 +-----
 sys/netatalk/ddp_usrreq.c                       |   9 +----
 sys/netbt/bt_sysctl.c                           |  11 +-----
 sys/netinet/accf_http.c                         |   9 +----
 sys/netinet/if_arp.c                            |   9 +----
 sys/netinet/igmp.c                              |   9 +----
 sys/netinet/in_selsrc.c                         |  10 +-----
 sys/netinet/ip_carp.c                           |   9 +----
 sys/netinet/ip_icmp.c                           |   9 +----
 sys/netinet/ip_input.c                          |   9 +----
 sys/netinet/ip_reass.c                          |   9 +----
 sys/netinet/raw_ip.c                            |   9 +----
 sys/netinet/tcp_usrreq.c                        |   9 +----
 sys/netinet/udp_usrreq.c                        |  10 +----
 sys/netinet6/icmp6.c                            |   9 +----
 sys/netinet6/ip6_input.c                        |   9 +----
 sys/netinet6/ip6_mroute.c                       |  10 +----
 sys/netinet6/raw_ip6.c                          |   9 +----
 sys/netinet6/udp6_usrreq.c                      |  10 +----
 sys/netipsec/ipsec_netbsd.c                     |  14 +-------
 sys/netipsec/key.c                              |  15 +--------
 sys/netmpls/mpls_proto.c                        |   9 +----
 sys/nfs/nfs_vfsops.c                            |   9 +----
 sys/opencrypto/crypto.c                         |  10 +----
 sys/rump/librump/rumpkern/rump.c                |   9 +----
 sys/secmodel/bsd44/secmodel_bsd44.c             |  12 +-----
 sys/secmodel/extensions/secmodel_extensions.c   |  28 +++---------------
 sys/secmodel/keylock/secmodel_keylock.c         |  12 +-----
 sys/secmodel/overlay/secmodel_overlay.c         |  12 +-----
 sys/secmodel/securelevel/secmodel_securelevel.c |  17 +---------
 sys/secmodel/suser/secmodel_suser.c             |  12 +-----
 sys/sys/sysctl.h                                |   3 +-
 sys/ufs/ext2fs/ext2fs_vfsops.c                  |   9 +----
 sys/ufs/ffs/ffs_vfsops.c                        |   9 +----
 sys/ufs/lfs/lfs_vfsops.c                        |   9 +----
 sys/ufs/lfs/ulfs_dirhash.c                      |  12 +-----
 sys/ufs/mfs/mfs_vfsops.c                        |   9 +----
 sys/ufs/ufs/ufs_dirhash.c                       |  12 +-----
 sys/uvm/uvm_meter.c                             |   9 +----
 168 files changed, 412 insertions(+), 1462 deletions(-)

diffs (truncated from 5675 to 300 lines):

diff -r f604d587e671 -r 50e7e4f14a69 sys/arch/arm/arm32/arm32_machdep.c
--- a/sys/arch/arm/arm32/arm32_machdep.c        Tue Feb 25 17:56:03 2014 +0000
+++ b/sys/arch/arm/arm32/arm32_machdep.c        Tue Feb 25 18:30:08 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm32_machdep.c,v 1.99 2014/01/11 17:32:20 matt Exp $  */
+/*     $NetBSD: arm32_machdep.c,v 1.100 2014/02/25 18:30:08 pooka Exp $        */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.99 2014/01/11 17:32:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.100 2014/02/25 18:30:08 pooka Exp $");
 
 #include "opt_modular.h"
 #include "opt_md.h"
@@ -502,11 +502,6 @@
         * return the right machine_arch based on the running executable.
         */
        sysctl_createv(clog, 0, NULL, NULL,
-                      CTLFLAG_PERMANENT,
-                      CTLTYPE_NODE, "hw", NULL,
-                      NULL, 0, NULL, 0,
-                      CTL_HW, CTL_EOL);
-       sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT|CTLFLAG_READONLY,
                       CTLTYPE_STRING, "machine_arch",
                       SYSCTL_DESCR("Machine CPU class"),
diff -r f604d587e671 -r 50e7e4f14a69 sys/arch/evbarm/tsarm/toastersensors.c
--- a/sys/arch/evbarm/tsarm/toastersensors.c    Tue Feb 25 17:56:03 2014 +0000
+++ b/sys/arch/evbarm/tsarm/toastersensors.c    Tue Feb 25 18:30:08 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: toastersensors.c,v 1.11 2012/11/12 18:00:40 skrll Exp $ */
+/* $NetBSD: toastersensors.c,v 1.12 2014/02/25 18:30:08 pooka Exp $ */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toastersensors.c,v 1.11 2012/11/12 18:00:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toastersensors.c,v 1.12 2014/02/25 18:30:08 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -179,14 +179,6 @@
        aprint_normal_dev(self, "using signals DIO_1-DIO_5 for panel buttons\n");
        aprint_normal_dev(self, "using 12-bit MAX197-ADC channel 0 for burnlevel knob\n");
 
-       if (sysctl_createv(NULL, 0, NULL, NULL,
-                               CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw",
-                               NULL, NULL, 0, NULL, 0,
-                               CTL_HW, CTL_EOL) != 0) {
-               printf("%s: could not create sysctl\n",
-                       device_xname(self));
-               return;
-       }
        if (sysctl_createv(NULL, 0, NULL, &node,
                                0, CTLTYPE_NODE, device_xname(self),
                                NULL,
diff -r f604d587e671 -r 50e7e4f14a69 sys/arch/evbarm/tsarm/tspld.c
--- a/sys/arch/evbarm/tsarm/tspld.c     Tue Feb 25 17:56:03 2014 +0000
+++ b/sys/arch/evbarm/tsarm/tspld.c     Tue Feb 25 18:30:08 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tspld.c,v 1.23 2012/11/12 18:00:40 skrll Exp $ */
+/*     $NetBSD: tspld.c,v 1.24 2014/02/25 18:30:08 pooka Exp $ */
 
 /*-
  * Copyright (c) 2004 Jesse Off
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.23 2012/11/12 18:00:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.24 2014/02/25 18:30:08 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -152,14 +152,6 @@
        bus_space_handle_t      ioh;
         const struct sysctlnode *node;
 
-       if (sysctl_createv(NULL, 0, NULL, NULL,
-                               CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw",
-                               NULL, NULL, 0, NULL, 0,
-                               CTL_HW, CTL_EOL) != 0) {
-               printf("%s: could not create sysctl\n",
-                       device_xname(self));
-               return;
-       }
        if (sysctl_createv(NULL, 0, NULL, &node,
                                0, CTLTYPE_NODE, device_xname(self),
                                NULL,
diff -r f604d587e671 -r 50e7e4f14a69 sys/arch/evbppc/obs405/dev/obsled.c
--- a/sys/arch/evbppc/obs405/dev/obsled.c       Tue Feb 25 17:56:03 2014 +0000
+++ b/sys/arch/evbppc/obs405/dev/obsled.c       Tue Feb 25 18:30:08 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: obsled.c,v 1.9 2012/06/02 21:36:41 dsl Exp $   */
+/*     $NetBSD: obsled.c,v 1.10 2014/02/25 18:30:08 pooka Exp $        */
 
 /*
  * Copyright (c) 2004 Shigeyuki Fukushima.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obsled.c,v 1.9 2012/06/02 21:36:41 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obsled.c,v 1.10 2014/02/25 18:30:08 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -99,15 +99,6 @@
 
        /* add sysctl interface */
        err = sysctl_createv(NULL, 0,
-                       NULL, NULL,
-                       0, CTLTYPE_NODE,
-                       "hw",
-                       NULL,
-                       NULL, 0, NULL, 0,
-                       CTL_HW, CTL_EOL);
-       if (err != 0)
-               return;
-       err = sysctl_createv(NULL, 0,
                        NULL, (const struct sysctlnode **)&node,
                        0, CTLTYPE_NODE,
                        "obsled",
diff -r f604d587e671 -r 50e7e4f14a69 sys/arch/hpcarm/dev/j720tp.c
--- a/sys/arch/hpcarm/dev/j720tp.c      Tue Feb 25 17:56:03 2014 +0000
+++ b/sys/arch/hpcarm/dev/j720tp.c      Tue Feb 25 18:30:08 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: j720tp.c,v 1.10 2009/05/29 14:15:45 rjs Exp $  */
+/*     $NetBSD: j720tp.c,v 1.11 2014/02/25 18:30:08 pooka Exp $        */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 /* Jornada 720 touch-panel driver. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: j720tp.c,v 1.10 2009/05/29 14:15:45 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: j720tp.c,v 1.11 2014/02/25 18:30:08 pooka Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_j720tp.h"
@@ -560,14 +560,9 @@
        int rc;
 
        if ((rc = sysctl_createv(clog, 0, NULL, &rnode,
-           CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL,
-           NULL, 0, NULL, 0, CTL_HW, CTL_EOL)) != 0)
-               goto err;
-
-       if ((rc = sysctl_createv(clog, 0, &rnode, &rnode,
            CTLFLAG_PERMANENT, CTLTYPE_NODE, "j720tp",
            SYSCTL_DESCR("Jornada 720 touch panel controls"),
-           NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
+           NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0)
                goto err;
 
 #ifdef J720TP_DEBUG
diff -r f604d587e671 -r 50e7e4f14a69 sys/arch/sparc64/dev/lom.c
--- a/sys/arch/sparc64/dev/lom.c        Tue Feb 25 17:56:03 2014 +0000
+++ b/sys/arch/sparc64/dev/lom.c        Tue Feb 25 18:30:08 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lom.c,v 1.12 2014/02/20 11:00:40 joerg Exp $   */
+/*     $NetBSD: lom.c,v 1.13 2014/02/25 18:30:08 pooka Exp $   */
 /*     $OpenBSD: lom.c,v 1.21 2010/02/28 20:44:39 kettenis Exp $       */
 /*
  * Copyright (c) 2009 Mark Kettenis
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lom.c,v 1.12 2014/02/20 11:00:40 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lom.c,v 1.13 2014/02/25 18:30:08 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -238,7 +238,6 @@
 SYSCTL_SETUP_PROTO(sysctl_lom_setup);
 static int     lom_sysctl_alarm(SYSCTLFN_PROTO);
 
-static int hw_node = CTL_EOL;
 static const char *nodename[LOM_MAX_ALARM] =
     { "fault_led", "alarm1", "alarm2", "alarm3" };
 #ifdef SYSCTL_INCLUDE_DESCR
@@ -342,10 +341,9 @@
        }
 
        /* Setup our sysctl subtree, hw.lomN */
-       if (hw_node != CTL_EOL)
-               sysctl_createv(NULL, 0, NULL, &node,
-                   0, CTLTYPE_NODE, device_xname(self), NULL,
-                   NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL);
+       sysctl_createv(NULL, 0, NULL, &node,
+           0, CTLTYPE_NODE, device_xname(self), NULL,
+           NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL);
 
        /* Initialize sensor data. */
        sc->sc_sme = sysmon_envsys_create();
@@ -1203,18 +1201,6 @@
        return true;
 }
 
-SYSCTL_SETUP(sysctl_lom_setup, "sysctl hw.lom subtree setup")
-{
-       const struct sysctlnode *node;
-
-       if (sysctl_createv(clog, 0, NULL, &node,
-           CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw", NULL,
-           NULL, 0, NULL, 0, CTL_HW, CTL_EOL) != 0)
-               return;
-
-       hw_node = node->sysctl_num;
-}
-
 static int
 lom_sysctl_alarm(SYSCTLFN_ARGS)
 {
diff -r f604d587e671 -r 50e7e4f14a69 sys/arch/x86/acpi/acpi_wakeup.c
--- a/sys/arch/x86/acpi/acpi_wakeup.c   Tue Feb 25 17:56:03 2014 +0000
+++ b/sys/arch/x86/acpi/acpi_wakeup.c   Tue Feb 25 18:30:08 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_wakeup.c,v 1.37 2014/02/19 21:23:01 dsl Exp $     */
+/*     $NetBSD: acpi_wakeup.c,v 1.38 2014/02/25 18:30:08 pooka Exp $   */
 
 /*-
  * Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.37 2014/02/19 21:23:01 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.38 2014/02/25 18:30:08 pooka Exp $");
 
 /*-
  * Copyright (c) 2001 Takanori Watanabe <takawata%jp.freebsd.org@localhost>
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.37 2014/02/19 21:23:01 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.38 2014/02/25 18:30:08 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -408,15 +408,8 @@
        int err;
 
        err = sysctl_createv(clog, 0, NULL, &rnode,
-           CTLFLAG_PERMANENT, CTLTYPE_NODE, "hw",
-           NULL, NULL, 0, NULL, 0, CTL_HW, CTL_EOL);
-
-       if (err != 0)
-               return;
-
-       err = sysctl_createv(clog, 0, &rnode, &rnode,
            CTLFLAG_PERMANENT, CTLTYPE_NODE, "acpi", NULL,
-           NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL);
+           NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL);
 
        if (err != 0)
                return;
diff -r f604d587e671 -r 50e7e4f14a69 sys/coda/coda_vfsops.c
--- a/sys/coda/coda_vfsops.c    Tue Feb 25 17:56:03 2014 +0000
+++ b/sys/coda/coda_vfsops.c    Tue Feb 25 18:30:08 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: coda_vfsops.c,v 1.78 2013/11/27 17:24:44 christos Exp $        */
+/*     $NetBSD: coda_vfsops.c,v 1.79 2014/02/25 18:30:08 pooka Exp $   */
 
 /*
  *
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.78 2013/11/27 17:24:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.79 2014/02/25 18:30:08 pooka Exp $");
 
 #ifndef _KERNEL_OPT
 #define        NVCODA 4
@@ -550,11 +550,7 @@
 
 SYSCTL_SETUP(sysctl_vfs_coda_setup, "sysctl vfs.coda subtree setup")
 {
-       sysctl_createv(clog, 0, NULL, NULL,
-                      CTLFLAG_PERMANENT,
-                      CTLTYPE_NODE, "vfs", NULL,
-                      NULL, 0, NULL, 0,
-                      CTL_VFS, CTL_EOL);
+
        sysctl_createv(clog, 0, NULL, NULL,
                       CTLFLAG_PERMANENT,
                       CTLTYPE_NODE, "coda",
diff -r f604d587e671 -r 50e7e4f14a69 sys/compat/freebsd/freebsd_sysctl.c
--- a/sys/compat/freebsd/freebsd_sysctl.c       Tue Feb 25 17:56:03 2014 +0000



Home | Main Index | Thread Index | Old Index