Move kcov device definitions into <sys/conf.h>.

OK anton@ deraadt@ kettenis@ mpi@

diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index f6cd430..a8c1078 100644 (file)
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: conf.c,v 1.62 2018/08/19 18:01:04 deraadt Exp $       */
+/*     $OpenBSD: conf.c,v 1.63 2018/08/31 04:20:37 visa Exp $  */
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -112,13 +112,6 @@ int        nblkdev = nitems(bdevsw);
        (dev_type_stop((*))) enodev, 0, seltrue, \
        (dev_type_mmap((*))) enodev }
 
-/* open, close, ioctl, mmap */
-#define cdev_kcov_init(c,n) { \
-       dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
-       (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
-       (dev_type_stop((*))) enodev, 0, selfalse, \
-       (dev_init(c,n,mmap)), 0, D_CLONE }
-
 #define        mmread  mmrw
 #define        mmwrite mmrw
 cdev_decl(mm);
@@ -170,7 +163,6 @@ cdev_decl(nvram);
 cdev_decl(drm);
 #include "viocon.h"
 cdev_decl(viocon);
-cdev_decl(kcov);
 
 #include "wsdisplay.h"
 #include "wskbd.h"

diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 488ee4d..3565bc5 100644 (file)
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: conf.c,v 1.160 2018/08/19 18:01:05 deraadt Exp $      */
+/*     $OpenBSD: conf.c,v 1.161 2018/08/31 04:20:37 visa Exp $ */
 /*     $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $       */
 
 /*
@@ -114,13 +114,6 @@ int        nblkdev = nitems(bdevsw);
        (dev_type_stop((*))) enodev, 0, seltrue, \
        (dev_type_mmap((*))) enodev }
 
-/* open, close, ioctl, mmap */
-#define cdev_kcov_init(c,n) { \
-       dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
-       (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
-       (dev_type_stop((*))) enodev, 0, selfalse, \
-       (dev_init(c,n,mmap)), 0, D_CLONE }
-
 #define        mmread  mmrw
 #define        mmwrite mmrw
 cdev_decl(mm);
@@ -172,7 +165,6 @@ cdev_decl(cztty);
 cdev_decl(nvram);
 #include "drm.h"
 cdev_decl(drm);
-cdev_decl(kcov);
 
 #include "wsdisplay.h"
 #include "wskbd.h"

diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 6967ffb..48118f7 100644 (file)
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: conf.h,v 1.144 2018/01/13 13:03:42 robert Exp $       */
+/*     $OpenBSD: conf.h,v 1.145 2018/08/31 04:20:37 visa Exp $ */
 /*     $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $       */
 
 /*-
@@ -475,6 +475,13 @@ extern struct cdevsw cdevsw[];
        (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \
        (dev_type_mmap((*))) enodev, 0 }
 
+/* open, close, ioctl, mmap */
+#define cdev_kcov_init(c,n) { \
+       dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
+       (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
+       (dev_type_stop((*))) enodev, 0, selfalse, \
+       (dev_init(c,n,mmap)), 0, D_CLONE }
+
 #endif
 
 /*
@@ -607,6 +614,7 @@ cdev_decl(amdmsr);
 cdev_decl(fuse);
 cdev_decl(pvbus);
 cdev_decl(ipmi);
+cdev_decl(kcov);
 
 #endif