recognize kcov ioctl commands; ok deraadt@ mpi@ visa@

diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index e1918ae..e63158d 100644 (file)
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.34 2017/05/29 13:30:35 tedu Exp $
+#      $OpenBSD: Makefile,v 1.35 2018/08/29 17:47:07 anton Exp $
 
 LDSTATIC=${STATIC}
 PROG=  kdump
@@ -39,6 +39,7 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
            ${SYS_DIR}/sys/dkio.h \
            ${SYS_DIR}/sys/filio.h \
            ${SYS_DIR}/sys/gpio.h \
+           ${SYS_DIR}/sys/kcov.h \
            ${SYS_DIR}/sys/memrange.h \
            ${SYS_DIR}/sys/mtio.h \
            ${SYS_DIR}/sys/pciio.h \

diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index 21c66e6..9f5988d 100644 (file)
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#      $OpenBSD: mkioctls,v 1.39 2017/07/29 08:50:42 zhuk Exp $
+#      $OpenBSD: mkioctls,v 1.40 2018/08/29 17:47:07 anton Exp $
 
 #
 # Copyright (c) 1994
@@ -68,6 +68,7 @@ BEGIN {
        print "#include <sys/dkio.h>"
        print "#include <sys/filio.h>"
        print "#include <sys/gpio.h>"
+       print "#include <sys/kcov.h>"
        print "#include <sys/memrange.h>"
        print "#include <sys/mtio.h>"
        print "#include <sys/pciio.h>"
@@ -98,7 +99,7 @@ BEGIN {
        print ""
 }
 
-/^[    ]*#[    ]*define[       ]+(ATAIO|AUDIO_|BIOC|CDIO|CHIO|DIOC|DRM|GPIO|IPMICTL|TIO|FIO|MEMRANGE|MTIOC|LIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PIPEX|PPPIOC|PPPOE|PVBUSIOC|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|UDLIO|USB|VIDIOC|VNDIOC|VSCSI|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[   ]+(DRM)?_IO/ {
+/^[    ]*#[    ]*define[       ]+(ATAIO|AUDIO_|BIOC|CDIO|CHIO|DIOC|DRM|GPIO|IPMICTL|TIO|FIO|KIO|MEMRANGE|MTIOC|LIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PIPEX|PPPIOC|PPPOE|PVBUSIOC|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|UDLIO|USB|VIDIOC|VNDIOC|VSCSI|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[       ]+(DRM)?_IO/ {
 
        # find where the name starts
        for (i = 1; i <= NF; i++)