summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/alpha/conf.c5
-rw-r--r--sys/arch/amd64/amd64/conf.c5
-rw-r--r--sys/arch/arm/arm/conf.c5
-rw-r--r--sys/arch/arm64/arm64/conf.c5
-rw-r--r--sys/arch/hppa/hppa/conf.c5
-rw-r--r--sys/arch/i386/i386/conf.c5
-rw-r--r--sys/arch/landisk/landisk/conf.c5
-rw-r--r--sys/arch/loongson/loongson/conf.c5
-rw-r--r--sys/arch/luna88k/luna88k/conf.c5
-rw-r--r--sys/arch/macppc/macppc/conf.c5
-rw-r--r--sys/arch/octeon/octeon/conf.c5
-rw-r--r--sys/arch/powerpc64/powerpc64/conf.c5
-rw-r--r--sys/arch/sgi/sgi/conf.c5
-rw-r--r--sys/arch/sparc64/sparc64/conf.c5
14 files changed, 42 insertions, 28 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 0c4df9b7712..ff6a835c8de 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.87 2020/01/24 14:11:01 mpi Exp $ */
+/* $OpenBSD: conf.c,v 1.88 2020/07/06 04:32:25 dlg Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -107,6 +107,7 @@ cdev_decl(fd);
#include "cy.h"
cdev_decl(cy);
#include "ksyms.h"
+#include "kstat.h"
/* USB Devices */
#include "usb.h"
@@ -181,7 +182,7 @@ struct cdevsw cdevsw[] =
cdev_usbdev_init(NUGEN,ugen), /* 48: USB generic driver */
cdev_tty_init(NUCOM, ucom), /* 49: USB tty */
cdev_notdef(), /* 50 */
- cdev_notdef(), /* 51 */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: kernel statistics */
#ifdef USER_PCICONF
cdev_pci_init(NPCI,pci), /* 52: PCI user */
#else
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 1810222d857..ece07322586 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.70 2020/05/25 06:37:52 mpi Exp $ */
+/* $OpenBSD: conf.c,v 1.71 2020/07/06 04:32:25 dlg Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -142,6 +142,7 @@ cdev_decl(cy);
#include "pctr.h"
#include "bktr.h"
#include "ksyms.h"
+#include "kstat.h"
#include "usb.h"
#include "uhid.h"
#include "fido.h"
@@ -238,7 +239,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48 */
cdev_bktr_init(NBKTR,bktr), /* 49: Bt848 video capture device */
cdev_ksyms_init(NKSYMS,ksyms), /* 50: Kernel symbols device */
- cdev_notdef(), /* 51 */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: Kernel statistics */
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
cdev_notdef(), /* 53 was: sequencer I/O */
cdev_notdef(), /* 54 was: RAIDframe disk driver */
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 11ca6622462..3821d526cc6 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.54 2020/01/23 02:40:21 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.55 2020/07/06 04:32:25 dlg Exp $ */
/* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */
/*
@@ -73,6 +73,7 @@
#include "pty.h"
#include "tun.h"
#include "ksyms.h"
+#include "kstat.h"
/*
* APM interface
@@ -321,7 +322,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 48: reserved */
cdev_notdef(), /* 49: reserved */
cdev_notdef(), /* 50: reserved */
- cdev_notdef(), /* 51: reserved */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: kernel statistics */
cdev_bio_init(NBIO,bio), /* 52: ioctl tunnel */
cdev_notdef(), /* 53: reserved */
cdev_notdef(), /* 54 was FOOTBRIDGE console */
diff --git a/sys/arch/arm64/arm64/conf.c b/sys/arch/arm64/arm64/conf.c
index acb5b904c83..6d081ad6d3f 100644
--- a/sys/arch/arm64/arm64/conf.c
+++ b/sys/arch/arm64/arm64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.14 2020/05/25 06:37:52 mpi Exp $ */
+/* $OpenBSD: conf.c,v 1.15 2020/07/06 04:32:25 dlg Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -113,6 +113,7 @@ cdev_decl(spkr);
#include "midi.h"
#include "bktr.h"
#include "ksyms.h"
+#include "kstat.h"
#include "usb.h"
#include "uhid.h"
#include "fido.h"
@@ -198,7 +199,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48 */
cdev_bktr_init(NBKTR,bktr), /* 49: Bt848 video capture device */
cdev_ksyms_init(NKSYMS,ksyms), /* 50: Kernel symbols device */
- cdev_notdef(), /* 51 */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: kernel statistics */
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
cdev_notdef(), /* 53 was: sequencer I/O */
cdev_notdef(), /* 54 was: RAIDframe disk driver */
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 061bd9541b6..ddf72299e9c 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.69 2020/01/24 14:11:01 mpi Exp $ */
+/* $OpenBSD: conf.c,v 1.70 2020/07/06 04:32:25 dlg Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -91,6 +91,7 @@ int nblkdev = nitems(bdevsw);
#include "tun.h"
#include "ksyms.h"
+#include "kstat.h"
#include "lpt.h"
cdev_decl(lpt);
@@ -178,7 +179,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48: */
cdev_notdef(), /* 49: */
cdev_notdef(), /* 50: */
- cdev_notdef(), /* 51: */
+ cdev_ksyms_init(NKSTAT,kstat), /* 51: kernel statistics */
cdev_notdef(), /* 52: */
cdev_notdef(), /* 53: */
cdev_vscsi_init(NVSCSI,vscsi), /* 54: vscsi */
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 3fafddea4a4..6912d9cc781 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.169 2020/05/25 06:37:53 mpi Exp $ */
+/* $OpenBSD: conf.c,v 1.170 2020/07/06 04:32:25 dlg Exp $ */
/* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */
/*
@@ -136,6 +136,7 @@ cdev_decl(cy);
#include "bios.h"
#include "bktr.h"
#include "ksyms.h"
+#include "kstat.h"
#include "usb.h"
#include "uhid.h"
#include "fido.h"
@@ -231,7 +232,7 @@ struct cdevsw cdevsw[] =
cdev_ocis_init(NBIOS,bios), /* 48: onboard BIOS PROM */
cdev_bktr_init(NBKTR,bktr), /* 49: Bt848 video capture device */
cdev_ksyms_init(NKSYMS,ksyms), /* 50: Kernel symbols device */
- cdev_notdef(), /* 51 */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: kernel statistics */
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
cdev_notdef(), /* 53 was: sequencer I/O */
cdev_notdef(), /* 54 was: RAIDframe disk driver */
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index b4f236fd8cb..b23ef6f4b6b 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.41 2020/01/23 02:40:21 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.42 2020/07/06 04:32:25 dlg Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -73,6 +73,7 @@
#include "pty.h"
#include "tun.h"
#include "ksyms.h"
+#include "kstat.h"
/*
* Disk/Filesystem pseudo-devices
@@ -295,7 +296,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 48: reserved */
cdev_notdef(), /* 49: reserved */
cdev_notdef(), /* 50: reserved */
- cdev_notdef(), /* 51: reserved */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: kernel statistics */
cdev_notdef(), /* 52: reserved */
cdev_notdef(), /* 53: reserved */
cdev_notdef(), /* 54: reserved */
diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c
index e996376616d..7ea9243382e 100644
--- a/sys/arch/loongson/loongson/conf.c
+++ b/sys/arch/loongson/loongson/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.28 2020/01/23 02:40:21 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.29 2020/07/06 04:32:25 dlg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -108,6 +108,7 @@ cdev_decl(wd);
#include "audio.h"
#include "video.h"
#include "ksyms.h"
+#include "kstat.h"
#include "wsdisplay.h"
#include "wskbd.h"
@@ -188,7 +189,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_notdef(), /* 50: */
- cdev_notdef(), /* 51: */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: kernel statistics */
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_notdef(), /* 53: */
cdev_notdef(), /* 54: */
diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c
index 62bade4f97b..d10b67de9e7 100644
--- a/sys/arch/luna88k/luna88k/conf.c
+++ b/sys/arch/luna88k/luna88k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.33 2020/01/23 02:40:21 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.34 2020/07/06 04:32:25 dlg Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -54,6 +54,7 @@
#include "wd.h"
#include "ksyms.h"
+#include "kstat.h"
#include "audio.h"
#include "com.h"
@@ -153,7 +154,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48 */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_notdef(), /* 50 */
- cdev_notdef(), /* 51 */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: kernel statistics */
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */
cdev_disk_init(1,diskmap), /* 54: disk mapper */
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 5885cdac2b6..a7c0ef70971 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.71 2020/01/23 02:40:21 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.72 2020/07/06 04:32:25 dlg Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -94,6 +94,7 @@ cdev_decl(com);
#include "tun.h"
#include "ksyms.h"
+#include "kstat.h"
#include "usb.h"
#include "uhid.h"
#include "fido.h"
@@ -181,7 +182,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
cdev_notdef(), /* 50 */
- cdev_notdef(), /* 51 */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: kernel statistics */
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
cdev_notdef(), /* 53 was: sequencer I/O */
cdev_notdef(), /* 54 was: RAIDframe disk driver */
diff --git a/sys/arch/octeon/octeon/conf.c b/sys/arch/octeon/octeon/conf.c
index a9a9cda2f62..51608cb7e32 100644
--- a/sys/arch/octeon/octeon/conf.c
+++ b/sys/arch/octeon/octeon/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.24 2020/01/23 02:40:21 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.25 2020/07/06 04:32:25 dlg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -121,6 +121,7 @@ cdev_decl(octcf);
cdev_decl(amdcf);
#include "ksyms.h"
+#include "kstat.h"
#include "wsdisplay.h"
#include "wskbd.h"
@@ -207,7 +208,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_notdef(), /* 50: */
- cdev_notdef(), /* 51: */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: kernel statistics */
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_fuse_init(NFUSE,fuse), /* 53: fuse */
cdev_notdef(), /* 54: */
diff --git a/sys/arch/powerpc64/powerpc64/conf.c b/sys/arch/powerpc64/powerpc64/conf.c
index 46938f37f8e..34021ad6798 100644
--- a/sys/arch/powerpc64/powerpc64/conf.c
+++ b/sys/arch/powerpc64/powerpc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.7 2020/06/29 21:16:45 kettenis Exp $ */
+/* $OpenBSD: conf.c,v 1.8 2020/07/06 04:32:25 dlg Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -68,6 +68,7 @@ cdev_decl(com);
#include "ipmi.h"
#include "kcov.h"
#include "ksyms.h"
+#include "kstat.h"
#include "lpt.h"
cdev_decl(lpt);
#include "midi.h"
@@ -115,7 +116,7 @@ struct cdevsw cdevsw[] =
cdev_random_init(1,random), /* 12: random data source */
cdev_dt_init(NDT,dt), /* 13: dynamic tracer */
cdev_kcov_init(NKCOV,kcov), /* 14: kcov */
- cdev_notdef(), /* 15 */
+ cdev_kstat_init(NKSTAT,kstat), /* 15: kernel statistics */
cdev_notdef(), /* 16 */
cdev_notdef(), /* 17 */
cdev_notdef(), /* 18 */
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 5b0a9d5b429..bb9d2ef6d88 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.42 2020/01/23 02:40:21 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.43 2020/07/06 04:32:25 dlg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -107,6 +107,7 @@ cdev_decl(wd);
#include "audio.h"
#include "video.h"
#include "ksyms.h"
+#include "kstat.h"
#include "wsdisplay.h"
#include "wskbd.h"
@@ -187,7 +188,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_notdef(), /* 50: */
- cdev_notdef(), /* 51: */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: kernel statistics */
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
cdev_notdef(), /* 53: */
cdev_notdef(), /* 54: */
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index fcb23b6c5cc..49c31ac84c3 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.83 2020/01/23 02:40:22 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.84 2020/07/06 04:32:25 dlg Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -112,6 +112,7 @@ cdev_decl(pci);
#include "pf.h"
#include "ksyms.h"
+#include "kstat.h"
#include "hotplug.h"
#include "vscsi.h"
@@ -203,7 +204,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
cdev_notdef(), /* 50 */
- cdev_notdef(), /* 51 */
+ cdev_kstat_init(NKSTAT,kstat), /* 51: kernel statistics */
#ifdef USER_PCICONF
cdev_pci_init(NPCI,pci), /* 52: PCI user */
#else