summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatthew <matthew@openbsd.org>2011-06-23 20:51:20 +0000
committermatthew <matthew@openbsd.org>2011-06-23 20:51:20 +0000
commit47dec04f23cff0a8f5cffda7b38bf9d279468c6b (patch)
treed2736704ae175354e9df2a2c3f82754c1f0939d4
parentFix the error path in bus_dmamem_map. (diff)
downloadwireguard-openbsd-47dec04f23cff0a8f5cffda7b38bf9d279468c6b.tar.xz
wireguard-openbsd-47dec04f23cff0a8f5cffda7b38bf9d279468c6b.zip
Don't check dev/ramdisk.h for ioctl(2) commands as it doesn't exist
anymore. Noticed by and ok claudio@
-rw-r--r--usr.bin/kdump/Makefile3
-rw-r--r--usr.bin/kdump/mkioctls5
2 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index 90a7e9894d0..930a40df852 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2011/06/20 17:54:48 otto Exp $
+# $OpenBSD: Makefile,v 1.19 2011/06/23 20:51:20 matthew Exp $
LDSTATIC=${STATIC}
PROG= kdump
@@ -14,7 +14,6 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
${DESTDIR}/usr/include/crypto/cryptodev.h \
${DESTDIR}/usr/include/dev/biovar.h \
${DESTDIR}/usr/include/dev/ccdvar.h \
- ${DESTDIR}/usr/include/dev/ramdisk.h \
${DESTDIR}/usr/include/dev/systrace.h \
${DESTDIR}/usr/include/dev/wscons/wsconsio.h \
${DESTDIR}/usr/include/dev/vndioctl.h \
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index c680d44dbf2..0a5ba72cf84 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $OpenBSD: mkioctls,v 1.23 2010/12/29 17:51:48 deraadt Exp $
+# $OpenBSD: mkioctls,v 1.24 2011/06/23 20:51:20 matthew Exp $
#
# Copyright (c) 1994
@@ -76,7 +76,6 @@ BEGIN {
print "#include <crypto/cryptodev.h>"
print "#include <dev/biovar.h>"
print "#include <dev/ccdvar.h>"
- print "#include <dev/ramdisk.h>"
print "#include <dev/systrace.h>"
print "#include <dev/wscons/wsconsio.h>"
print "#include <dev/vndioctl.h>"
@@ -91,7 +90,7 @@ BEGIN {
print ""
}
-/^#[ ]*define[ ]*(AGPIOC_|ATAIO|AUDIO_|BIOC|CCDIOC|CDIO|CIOC|CHIO|DIOC|MIDI_|GPIO|SEQUENCER_|TIO|FIO|MTIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RD_|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX)[A-Z_0-9]*[ ]*_IO/ {
+/^#[ ]*define[ ]*(AGPIOC_|ATAIO|AUDIO_|BIOC|CCDIOC|CDIO|CIOC|CHIO|DIOC|MIDI_|GPIO|SEQUENCER_|TIO|FIO|MTIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX)[A-Z_0-9]*[ ]*_IO/ {
# find where the name starts
for (i = 1; i <= NF; i++)