please note that the commented out example usage in etc/MAKEDEV.common
remains till someone feels the need to change it.
OK?
diff --git etc/MAKEDEV.common etc/MAKEDEV.common
index bfcd943..b656d46 100644
--- etc/MAKEDEV.common
+++ etc/MAKEDEV.common
@@ -131,11 +131,10 @@ target(all, wd, 0, 1, 2, 3)dnl
target(all, xd, 0, 1, 2, 3)dnl
target(all, systrace)dnl
target(all, pctr)dnl
target(all, pctr0)dnl
target(all, pf)dnl
-twrget(all, cry, crypto)dnl
target(all, apm)dnl
target(all, acpi)dnl
twrget(all, tth, ttyh, 0, 1)dnl
target(all, ttyA, 0, 1)dnl
target(all, ttyB, 0, 1, 2, 3, 4, 5)dnl
@@ -446,12 +445,10 @@ __devitem(fdesc, fd, fd/* nodes, fd)dnl
_mkdev(fdesc, fd, {-RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
while [ $n -lt 64 ];do M fd/$n c major_fdesc_c $n;n=Add($n, 1);done
MKlist[${#MKlist[*]}]=";chmod 555 fd"-})dnl
__devitem(oppr, openprom,PROM settings,openprom)dnl
_cdev(oppr, openprom, 70, 0)dnl
-__devitem(cry, crypto, Hardware crypto access driver,crypto)dnl
-_mkdev(cry, crypto, {-M crypto c major_cry_c-} 0)dnl
__devitem(pf, pf*, Packet Filter)dnl
_mkdev(pf, {-pf*-}, {-M pf c major_pf_c 0 600-})dnl
__devitem(bpf, bpf*, Berkeley Packet Filter)dnl
_mkdev(bpf, {-bpf*-}, {-M bpf$U c major_bpf_c $U 600-}, 600)dnl
_mkdev(tun, {-tun*-}, {-M tun$U c major_tun_c $U 600-}, 600)dnl
diff --git etc/etc.alpha/MAKEDEV etc/etc.alpha/MAKEDEV
index 2dd9859..050aa4e 100644
--- etc/etc.alpha/MAKEDEV
+++ etc/etc.alpha/MAKEDEV
@@ -68,11 +68,10 @@
# Special purpose devices:
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# hotplug devices hot plugging
# lkm Loadable kernel modules interface
@@ -324,14 +323,10 @@ fd)
diskmap)
M diskmap c 63 0 640 operator
;;
-crypto)
- M crypto c 57 0
- ;;
-
bpf*)
M bpf$U c 11 $U 600
;;
bktr*)
@@ -539,11 +534,11 @@ all)
R local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2
R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker
R video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm
R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
R tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
- R ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 crypto pf systrace wd0
+ R ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 pf systrace wd0
R wd1 wd2 wd3 std st0 st1 fd
;;
wd*|sd*)
case $i in
diff --git etc/etc.amd64/MAKEDEV etc/etc.amd64/MAKEDEV
index 2971021..4a0d05c 100644
--- etc/etc.amd64/MAKEDEV
+++ etc/etc.amd64/MAKEDEV
@@ -68,11 +68,10 @@
# apm Power Management Interface
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# drm* Direct Rendering Manager
# fd fd/* nodes
# fuse Userland Filesystem
# gpio* General Purpose Input/Output
@@ -344,14 +343,10 @@ drm*)
diskmap)
M diskmap c 90 0 640 operator
;;
-crypto)
- M crypto c 70 0
- ;;
-
bpf*)
M bpf$U c 23 $U 600
;;
bktr*)
@@ -565,11 +560,11 @@ all)
R wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3
R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker video0
R video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
R tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm
- R crypto pf pctr systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+ R pf pctr systrace wd0 wd1 wd2 wd3 std st0 st1 fd
;;
wd*|sd*)
case $i in
wd*) dodisk wd $U 0 3 $U 0;;
diff --git etc/etc.armish/MAKEDEV etc/etc.armish/MAKEDEV
index 7a3a21e..25fd4d4 100644
--- etc/etc.armish/MAKEDEV
+++ etc/etc.armish/MAKEDEV
@@ -62,11 +62,10 @@
# apm Power management device
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# hotplug devices hot plugging
# lkm Loadable kernel modules interface
@@ -302,14 +301,10 @@ fd)
diskmap)
M diskmap c 102 0 640 operator
;;
-crypto)
- M crypto c 47 0
- ;;
-
bpf*)
M bpf$U c 22 $U 600
;;
bktr*)
@@ -481,11 +476,11 @@ all)
R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 audio0
R audio1 audio2 fuse pppx hotplug ptm local wscons pci0 pci1
R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
R rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 random lkm
R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
- R tty0a tty0b apm crypto pf systrace wd0 wd1 wd2 wd3 std st0
+ R tty0a tty0b apm pf systrace wd0 wd1 wd2 wd3 std st0
R st1 fd
;;
wd*|sd*)
case $i in
diff --git etc/etc.armv7/MAKEDEV etc/etc.armv7/MAKEDEV
index cf90e92..445b815 100644
--- etc/etc.armv7/MAKEDEV
+++ etc/etc.armv7/MAKEDEV
@@ -62,11 +62,10 @@
# apm Power management device
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# gpio* General Purpose Input/Output
# hotplug devices hot plugging
@@ -307,14 +306,10 @@ fd)
diskmap)
M diskmap c 102 0 640 operator
;;
-crypto)
- M crypto c 47 0
- ;;
-
bpf*)
M bpf$U c 22 $U 600
;;
bktr*)
@@ -486,11 +481,11 @@ all)
R cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 fuse pppx
R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0
R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
R radio0 video0 video1 uk0 random lkm tty00 tty01 tty02 tty03
- R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm crypto
+ R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm
R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
;;
wd*|sd*)
case $i in
diff --git etc/etc.hppa/MAKEDEV etc/etc.hppa/MAKEDEV
index 32bf198..bd35b3e 100644
--- etc/etc.hppa/MAKEDEV
+++ etc/etc.hppa/MAKEDEV
@@ -64,11 +64,10 @@
# ttyU* USB serial ports
# Special purpose devices:
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# hotplug devices hot plugging
# lkm Loadable kernel modules interface
@@ -290,14 +289,10 @@ fd)
diskmap)
M diskmap c 56 0 640 operator
;;
-crypto)
- M crypto c 36 0
- ;;
-
bpf*)
M bpf$U c 17 $U 600
;;
bio)
@@ -498,11 +493,11 @@ all)
R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap
R vscsi0 bio ch0 audio0 audio1 audio2 fuse pppx hotplug ptm
R local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
- R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b crypto
+ R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b
R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
;;
wd*|sd*)
case $i in
diff --git etc/etc.hppa64/MAKEDEV etc/etc.hppa64/MAKEDEV
index 0faa6b1..8a515e7 100644
--- etc/etc.hppa64/MAKEDEV
+++ etc/etc.hppa64/MAKEDEV
@@ -64,11 +64,10 @@
# ttyU* USB serial ports
# Special purpose devices:
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# lkm Loadable kernel modules interface
# pci* PCI bus devices
@@ -285,14 +284,10 @@ fd)
diskmap)
M diskmap c 56 0 640 operator
;;
-crypto)
- M crypto c 36 0
- ;;
-
bpf*)
M bpf$U c 17 $U 600
;;
bio)
@@ -493,11 +488,11 @@ all)
R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap
R vscsi0 ch0 audio0 audio1 audio2 fuse pppx ptm local wscons
R pci0 pci1 pci2 pci3 uall video0 video1 uk0 random lpa0 lpa1
R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 tty04 tty05
- R tty06 tty07 tty08 tty09 tty0a tty0b crypto pf systrace wd0
+ R tty06 tty07 tty08 tty09 tty0a tty0b pf systrace wd0
R wd1 wd2 wd3 std st0 st1 fd
;;
wd*|sd*)
case $i in
diff --git etc/etc.i386/MAKEDEV etc/etc.i386/MAKEDEV
index 0b15760..124abf5 100644
--- etc/etc.i386/MAKEDEV
+++ etc/etc.i386/MAKEDEV
@@ -69,11 +69,10 @@
# apm Power management device
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# drm* Direct Rendering Manager
# fd fd/* nodes
# fuse Userland Filesystem
# gpio* General Purpose Input/Output
@@ -350,14 +349,10 @@ drm*)
diskmap)
M diskmap c 91 0 640 operator
;;
-crypto)
- M crypto c 70 0
- ;;
-
bpf*)
M bpf$U c 23 $U 600
;;
bktr*)
@@ -575,11 +570,11 @@ all)
R local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2
R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker
R video0 video1 uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1
R lpt2 lkm tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07
R tty08 tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5
- R ttyc6 ttyc7 apm crypto pf pctr systrace wd0 wd1 wd2 wd3 std
+ R ttyc6 ttyc7 apm pf pctr systrace wd0 wd1 wd2 wd3 std
R st0 st1 fd
;;
wd*|sd*)
case $i in
diff --git etc/etc.landisk/MAKEDEV etc/etc.landisk/MAKEDEV
index 208506a..7371d23 100644
--- etc/etc.landisk/MAKEDEV
+++ etc/etc.landisk/MAKEDEV
@@ -60,11 +60,10 @@
# usb* Bus control devices used by usbd for attach/detach
# Special purpose devices:
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# hotplug devices hot plugging
# lkm Loadable kernel modules interface
@@ -295,14 +294,10 @@ fd)
diskmap)
M diskmap c 101 0 640 operator
;;
-crypto)
- M crypto c 47 0
- ;;
-
bpf*)
M bpf$U c 22 $U 600
;;
bio)
@@ -460,11 +455,11 @@ all)
R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 ttya audio0
R audio1 audio2 fuse pppx hotplug ptm local wscons pci0 pci1
R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
- R rmidi6 rmidi7 radio0 video0 video1 uk0 random lkm crypto pf
+ R rmidi6 rmidi7 radio0 video0 video1 uk0 random lkm pf
R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
;;
wd*|sd*)
case $i in
diff --git etc/etc.loongson/MAKEDEV etc/etc.loongson/MAKEDEV
index dbdb8ab..1e72e41 100644
--- etc/etc.loongson/MAKEDEV
+++ etc/etc.loongson/MAKEDEV
@@ -62,11 +62,10 @@
# Special purpose devices:
# apm Power management device
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# hotplug devices hot plugging
# pci* PCI bus devices
@@ -276,14 +275,10 @@ fd)
diskmap)
M diskmap c 70 0 640 operator
;;
-crypto)
- M crypto c 47 0
- ;;
-
bpf*)
M bpf$U c 12 $U 600
;;
bio)
@@ -455,11 +450,11 @@ all)
R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 diskmap vscsi0
R audio0 audio1 audio2 fuse pppx hotplug ptm local wscons pci0
R pci1 pci2 pci3 uall video0 video1 uk0 random tty00 tty01
R tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b
- R apm crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+ R apm pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
;;
wd*|sd*)
case $i in
wd*) dodisk wd $U 4 18 $U 0;;
diff --git etc/etc.macppc/MAKEDEV etc/etc.macppc/MAKEDEV
index f6a9da4..4cc4c51 100644
--- etc/etc.macppc/MAKEDEV
+++ etc/etc.macppc/MAKEDEV
@@ -65,11 +65,10 @@
# apm Power management device
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# drm* Direct Rendering Manager
# fd fd/* nodes
# fuse Userland Filesystem
# gpio* General Purpose Input/Output
@@ -313,14 +312,10 @@ drm*)
diskmap)
M diskmap c 84 0 640 operator
;;
-crypto)
- M crypto c 47 0
- ;;
-
bpf*)
M bpf$U c 22 $U 600
;;
bktr*)
@@ -518,11 +513,11 @@ all)
R bpf8 bpf9 pty0 diskmap vscsi0 ch0 cuaa cuab ttya ttyb audio0
R audio1 audio2 fuse pppx hotplug ptm local wscons pci0 pci1
R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
R rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 random lkm
R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
- R tty0a tty0b apm crypto pf systrace wd0 wd1 wd2 wd3 std st0
+ R tty0a tty0b apm pf systrace wd0 wd1 wd2 wd3 std st0
R st1 fd
;;
wd*|sd*)
case $i in
diff --git etc/etc.octeon/MAKEDEV etc/etc.octeon/MAKEDEV
index d5ad30f..6d19185 100644
--- etc/etc.octeon/MAKEDEV
+++ etc/etc.octeon/MAKEDEV
@@ -56,11 +56,10 @@
# ttyU* USB serial ports
# Special purpose devices:
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# hotplug devices hot plugging
# pci* PCI bus devices
@@ -270,14 +269,10 @@ fd)
diskmap)
M diskmap c 69 0 640 operator
;;
-crypto)
- M crypto c 47 0
- ;;
-
bpf*)
M bpf$U c 12 $U 600
;;
bio)
@@ -413,11 +408,11 @@ all)
R sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2
R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 diskmap
R vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug ptm local
R wscons pci0 pci1 pci2 pci3 video0 video1 uk0 random tty00
R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
- R tty0b crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+ R tty0b pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
;;
octcf*|wd*|sd*)
case $i in
octcf*) dodisk octcf $U 15 15 $U 0;;
diff --git etc/etc.sgi/MAKEDEV etc/etc.sgi/MAKEDEV
index d1b7428..0fe6409 100644
--- etc/etc.sgi/MAKEDEV
+++ etc/etc.sgi/MAKEDEV
@@ -62,11 +62,10 @@
# usb* Bus control devices used by usbd for attach/detach
# Special purpose devices:
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# hotplug devices hot plugging
# pci* PCI bus devices
@@ -276,14 +275,10 @@ fd)
diskmap)
M diskmap c 69 0 640 operator
;;
-crypto)
- M crypto c 47 0
- ;;
-
bpf*)
M bpf$U c 12 $U 600
;;
bio)
@@ -465,11 +460,11 @@ all)
R sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1
R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2
R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug
R ptm local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
- R tty09 tty0a tty0b crypto pf systrace wd0 wd1 wd2 wd3 std st0
+ R tty09 tty0a tty0b pf systrace wd0 wd1 wd2 wd3 std st0
R st1 fd
;;
wd*|sd*)
case $i in
diff --git etc/etc.sparc64/MAKEDEV etc/etc.sparc64/MAKEDEV
index d997a35..48d9b94 100644
--- etc/etc.sparc64/MAKEDEV
+++ etc/etc.sparc64/MAKEDEV
@@ -75,11 +75,10 @@
# usb* Bus control devices used by usbd for attach/detach
# Special purpose devices:
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# drm* Direct Rendering Manager
# fd fd/* nodes
# fuse Userland Filesystem
# hotplug devices hot plugging
@@ -341,14 +340,10 @@ drm*)
diskmap)
M diskmap c 130 0 640 operator
;;
-crypto)
- M crypto c 75 0
- ;;
-
bpf*)
M bpf$U c 105 $U 600
;;
bio)
@@ -640,11 +635,11 @@ all)
R fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 audio0
R audio1 audio2 fuse pppx hotplug ptm local wscons pci0 pci1
R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
R rmidi6 rmidi7 video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0
R lpt1 lpt2 lkm tty00 tty01 tty02 tty03 tty04 tty05 tty06
- R tty07 tty08 tty09 tty0a tty0b ttyh0 ttyh1 crypto pf systrace
+ R tty07 tty08 tty09 tty0a tty0b ttyh0 ttyh1 pf systrace
R wd0 wd1 wd2 wd3 std st0 st1 fd
;;
wd*|sd*)
case $i in
diff --git etc/etc.zaurus/MAKEDEV etc/etc.zaurus/MAKEDEV
index 3f14788..fe6816f 100644
--- etc/etc.zaurus/MAKEDEV
+++ etc/etc.zaurus/MAKEDEV
@@ -62,11 +62,10 @@
# apm Power management device
# audio* Audio devices
# bio ioctl tunnel pseudo-device
# bktr* Video frame grabbers
# bpf* Berkeley Packet Filter
-# crypto Hardware crypto access driver
# diskmap Disk mapper
# fd fd/* nodes
# fuse Userland Filesystem
# hotplug devices hot plugging
# lkm Loadable kernel modules interface
@@ -296,14 +295,10 @@ fd)
diskmap)
M diskmap c 102 0 640 operator
;;
-crypto)
- M crypto c 47 0
- ;;
-
bpf*)
M bpf$U c 22 $U 600
;;
bktr*)
@@ -474,11 +469,11 @@ all)
R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio diskmap vscsi0 ch0 audio0
R audio1 audio2 fuse pppx hotplug ptm local wscons uall rmidi0
R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
R radio0 video0 video1 uk0 random lkm tty00 tty01 tty02 tty03
- R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm crypto
+ R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm
R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
;;
wd*|sd*)
case $i in
diff --git etc/examples/sysctl.conf etc/examples/sysctl.conf
index ae9c835..544dd15 100644
--- etc/examples/sysctl.conf
+++ etc/examples/sysctl.conf
@@ -27,12 +27,10 @@
#ddb.console=1 # 1=Permit entry of ddb from the console
#fs.posix.setuid=0 # 0=Traditional BSD chown() semantics
#vm.swapencrypt.enable=0 # 0=Do not encrypt pages that go to swap
#vfs.nfs.iothreads=4 # Number of nfsio kernel threads
#net.inet.ip.mtudisc=0 # 0=Disable tcp mtu discovery
-#kern.usercrypto=1 # 1=Enable userland use of /dev/crypto
-#kern.userasymcrypto=1 # 1=Permit userland to do asymmetric crypto
#kern.splassert=2 # 2=Enable with verbose error messages
#kern.nosuidcoredump=3 # 3=Put suid coredumps in /var/crash/progname
#kern.watchdog.period=32 # >0=Enable hardware watchdog(4) timer if
available
#kern.watchdog.auto=0 # 0=Disable automatic watchdog(4) retriggering
#hw.allowpowerdown=0 # 0=Disable power button shutdown
diff --git lib/libc/gen/sysctl.3 lib/libc/gen/sysctl.3
index d06fcf8..41d0f2b 100644
--- lib/libc/gen/sysctl.3
+++ lib/libc/gen/sysctl.3
@@ -392,22 +392,21 @@ The changeable column shows whether a process with
appropriate
privileges may change the value.
The types of data currently available are process information,
system vnodes, the open file entries, routing table entries,
virtual memory statistics, load average history, and clock rate
information.
-.Bl -column "KERN_CRYPTODEVALLOWSOFT" "u_int64_t[CPUSTATES]" "no" -offset
indent
+.Bl -column "KERN_PROC_NOBROADKILL" "u_int64_t[CPUSTATES]" "no" -offset indent
.It Sy "Second level name" Ta Sy "Type" Ta Sy "Changeable"
.It Dv KERN_ARGMAX Ta "integer" Ta "no"
.It Dv KERN_ARND Ta "char[]" Ta "no"
.It Dv KERN_BOOTTIME Ta "struct timeval" Ta "no"
.It Dv KERN_BUFCACHEPERCENT Ta "integer" Ta "yes"
.It Dv KERN_CCPU Ta "integer" Ta "no"
.It Dv KERN_CLOCKRATE Ta "struct clockinfo" Ta "no"
.It Dv KERN_CONSDEV Ta "dev_t" Ta "no"
.It Dv KERN_CPTIME Ta "long[CPUSTATES]" Ta "no"
.It Dv KERN_CPTIME2 Ta "u_int64_t[CPUSTATES]" Ta "no"
-.It Dv KERN_CRYPTODEVALLOWSOFT Ta "integer" Ta "yes"
.It Dv KERN_DOMAINNAME Ta "string" Ta "yes"
.It Dv KERN_EMUL Ta "node" Ta "not applicable"
.It Dv KERN_FILE Ta "struct kinfo_file" Ta "no"
.It Dv KERN_FORKSTAT Ta "struct forkstat" Ta "no"
.It Dv KERN_FSCALE Ta "integer" Ta "no"
@@ -460,12 +459,10 @@ information.
.It Dv KERN_SYSVSEM Ta "integer" Ta "no"
.It Dv KERN_SYSVSHM Ta "integer" Ta "no"
.It Dv KERN_TIMECOUNTER Ta "node" Ta "not applicable"
.It Dv KERN_TTY Ta "node" Ta "not applicable"
.It Dv KERN_TTYCOUNT Ta "integer" Ta "no"
-.It Dv KERN_USERASYMCRYPTO Ta "integer" Ta "yes"
-.It Dv KERN_USERCRYPTO Ta "integer" Ta "yes"
.It Dv KERN_USERMOUNT Ta "integer" Ta "yes"
.It Dv KERN_VERSION Ta "string" Ta "no"
.It Dv KERN_VNODE Ta "struct e_vnode" Ta "no"
.It Dv KERN_WATCHDOG Ta "node" Ta "not applicable"
.El
@@ -512,14 +509,10 @@ system processing, or idling.
.It Dv KERN_CPTIME2
Similar to
.Dv KERN_CPTIME ,
but obtains information from only the single CPU specified by the
third level name given.
-.It Dv KERN_CRYPTODEVALLOWSOFT
-Permits userland to use
-.Pa /dev/crypto
-even if there is no hardware crypto accelerator in the system.
.It Dv KERN_DOMAINNAME
Get or set the YP domain name.
.It Dv KERN_EMUL
Enable binary emulation.
.Bl -column "KERN_EMUL_ENABLED" "integer" "Changeable" -offset indent
@@ -1031,21 +1024,10 @@ Returns the number of input characters in raw mode.
.El
.It Dv KERN_TTYCOUNT
Number of available
.Xr tty 4
devices.
-.It Dv KERN_USERASYMCRYPTO
-Permits userland to use
-.Pa /dev/crypto
-for cryptographic support for asymmetric (public) key operations via hardware
-cryptographic devices.
-.Dv KERN_USERCRYPTO
-(see below) must also be set.
-.It Dv KERN_USERCRYPTO
-Permits userland to use
-.Pa /dev/crypto
-for cryptographic support via hardware cryptographic devices.
.It Dv KERN_USERMOUNT
Return non-zero if regular users can issue
.Xr mount 2
requests.
The default value is 0.
diff --git share/man/man4/Makefile share/man/man4/Makefile
index 5aec7be..f36657b 100644
--- share/man/man4/Makefile
+++ share/man/man4/Makefile
@@ -15,11 +15,11 @@ MAN= aac.4 ac97.4 acphy.4 \
aue.4 auglx.4 auich.4 auixp.4 autri.4 auvia.4 axe.4 axen.4 az.4
azalia.4 \
bce.4 berkwdt.4 bge.4 bha.4 bio.4 bktr.4 bmtphy.4 bnx.4 \
boca.4 bpf.4 brgphy.4 bridge.4 brswphy.4 bwi.4 \
cac.4 cas.4 cardbus.4 carp.4 cd.4 cdce.4 cdcef.4 che.4 cfxga.4 \
ch.4 ciphy.4 ciss.4 clcs.4 clct.4 cmpci.4 cnw.4 \
- com.4 crypto.4 cue.4 cy.4 cz.4 dc.4 dcphy.4 ddb.4 de.4 \
+ com.4 cue.4 cy.4 cz.4 dc.4 dcphy.4 ddb.4 de.4 \
diskmap.4 divert.4 dpt.4 drm.4 \
eap.4 ec.4 eephy.4 ef.4 eg.4 ehci.4 eisa.4 el.4 em.4 emc.4 gcu.4 \
emu.4 enc.4 endrun.4 envy.4 ep.4 epic.4 esa.4 \
eso.4 ess.4 et.4 etphy.4 ex.4 exphy.4 \
fd.4 fdc.4 fins.4 fintek.4 fms.4 fuse.4 fxp.4 gdt.4 \
diff --git share/man/man4/crypto.4 share/man/man4/crypto.4
deleted file mode 100644
index c9e1ac0..0000000
--- share/man/man4/crypto.4
+++ /dev/null
@@ -1,107 +0,0 @@
-.\" $OpenBSD: crypto.4,v 1.18 2014/08/15 14:16:01 mikeb Exp $
-.\"
-.\" Copyright (c) 2001 Theo de Raadt
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd $Mdocdate: August 15 2014 $
-.Dt CRYPTO 4
-.Os
-.Sh NAME
-.Nm crypto
-.Nd hardware crypto access driver
-.Sh SYNOPSIS
-.Cd "pseudo-device crypto" Op Ar count
-.Sh DESCRIPTION
-The
-.Nm
-driver provides userland applications access to hardware crypto support
-via the kernel.
-The
-.Pa /dev/crypto
-device node primarily operates in an
-.Xr ioctl 2
-based model, permitting a variety of applications to query device capabilities,
-submit transactions, and get results.
-.Pp
-If
-.Ar count
-is given in the specification, and is greater than 0, a maximum of one
-.Nm crypto
-device is created.
-.Pp
-The following
-.Xr ioctl 2
-calls apply only to the
-.Nm crypto
-devices:
-.Bl -tag -width CIOCGSESSION
-.It Dv CIOCGSESSION
-Set up a new crypto session for a new type of operation.
-.It Dv CIOCFSESSION
-Free a previously established session.
-.It Dv CIOCCRYPT
-Perform a crypto operation against a previously set up session.
-.El
-.Sh FEATURES
-Depending on hardware being present, the following symmetric and
-asymmetric cryptographic features are potentially available from
-.Pa /dev/crypto :
-.Pp
-.Bl -tag -compact -width CRYPTO_RIPEMD160_HMAC -offset indent
-.It CRYPTO_DES_CBC
-.It CRYPTO_3DES_CBC
-.It CRYPTO_BLF_CBC
-.It CRYPTO_CAST_CBC
-.It CRYPTO_MD5_HMAC
-.It CRYPTO_SHA1_HMAC
-.It CRYPTO_RIPEMD160_HMAC
-.It CRYPTO_MD5_KPDK
-.It CRYPTO_SHA1_KPDK
-.It CRYPTO_AES_CBC
-.It CRYPTO_AES_CTR
-.It CRYPTO_AES_XTS
-.It CRYPTO_ARC4
-.It CRYPTO_MD5
-.It CRYPTO_SHA1
-.It CRK_MOD_EXP
-.It CRK_MOD_EXP_CRT
-.It CRK_DSA_SIGN
-.It CRK_DSA_VERIFY
-.It CRK_DH_COMPUTE_KEY
-.El
-.Sh FILES
-.Bl -tag -width /dev/crypto -compact
-.It Pa /dev/crypto
-crypto access device
-.El
-.Sh SEE ALSO
-.Xr hifn 4 ,
-.Xr safe 4 ,
-.Xr ubsec 4 ,
-.Xr crypto 9
-.Sh HISTORY
-The
-.Nm
-driver appeared in
-.Ox 3.0 .
diff --git share/man/man4/hifn.4 share/man/man4/hifn.4
index a75c85b..0a24bda 100644
--- share/man/man4/hifn.4
+++ share/man/man4/hifn.4
@@ -69,13 +69,11 @@ The
.Tn Hifn 7955 ,
and
.Tn Hifn 7956
chips all support acceleration of DES, Triple-DES, ARC4, MD5,
MD5-HMAC, SHA1, SHA1-HMAC, and LZS operations for
-.Xr ipsec 4
-and
-.Xr crypto 4 .
+.Xr ipsec 4 .
The
.Tn Hifn 7955
and
.Tn Hifn 7956
chips additionally support AES-CBC.
@@ -92,11 +90,10 @@ and
will also supply data to the kernel
.Xr random 4
subsystem.
.Sh SEE ALSO
.Xr crypt 3 ,
-.Xr crypto 4 ,
.Xr intro 4 ,
.Xr ipsec 4 ,
.Xr pci 4 ,
.Xr random 4 ,
.Xr crypto 9
diff --git share/man/man4/safe.4 share/man/man4/safe.4
index 127b107..6b65cfc 100644
--- share/man/man4/safe.4
+++ share/man/man4/safe.4
@@ -49,13 +49,11 @@ A faster version of the 1141.
.Pp
The
.Nm
driver registers itself to accelerate DES, Triple-DES, AES, MD5-HMAC,
and SHA1-HMAC operations for
-.Xr ipsec 4
-and
-.Xr crypto 4 .
+.Xr ipsec 4 .
.Pp
Additionally, the driver provides input to the
.Xr random 4
subsystem.
.Sh DIAGNOSTICS
@@ -66,11 +64,10 @@ The 1.0 silicon has major
bugs and may lock the bus completely.
There is no easy workaround.
.El
.Sh SEE ALSO
.Xr crypt 3 ,
-.Xr crypto 4 ,
.Xr intro 4 ,
.Xr ipsec 4 ,
.Xr pci 4 ,
.Xr random 4 ,
.Xr crypto 9
diff --git share/man/man4/ubsec.4 share/man/man4/ubsec.4
index 2662d24..b002eb1 100644
--- share/man/man4/ubsec.4
+++ share/man/man4/ubsec.4
@@ -71,13 +71,11 @@ Faster version of the BCM5861.
.Pp
The
.Nm
driver registers itself to accelerate DES, Triple-DES, MD5-HMAC,
and SHA1-HMAC operations for
-.Xr ipsec 4
-and
-.Xr crypto 4 .
+.Xr ipsec 4 .
The driver also supports acceleration of AES-CBC with the BCM5823 or newer.
.Pp
On all models except the Bluesteel 5501 and Broadcom 5801, the driver
registers itself to provide random data to the
.Xr random 4
diff --git share/man/man8/man8.alpha/MAKEDEV.8
share/man/man8/man8.alpha/MAKEDEV.8
index 9f5862c..001bfa8 100644
--- share/man/man8/man8.alpha/MAKEDEV.8
+++ share/man/man8/man8.alpha/MAKEDEV.8
@@ -203,13 +203,10 @@ ioctl tunnel pseudo-device, see
Video frame grabbers, see
.Xr bktr 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar fd
fd/* nodes, see
diff --git share/man/man8/man8.amd64/MAKEDEV.8
share/man/man8/man8.amd64/MAKEDEV.8
index 6dbc600..1d98ec7 100644
--- share/man/man8/man8.amd64/MAKEDEV.8
+++ share/man/man8/man8.amd64/MAKEDEV.8
@@ -203,13 +203,10 @@ ioctl tunnel pseudo-device, see
Video frame grabbers, see
.Xr bktr 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar drm*
Direct Rendering Manager, see
diff --git share/man/man8/man8.armish/MAKEDEV.8
share/man/man8/man8.armish/MAKEDEV.8
index 8ceca76..1508e57 100644
--- share/man/man8/man8.armish/MAKEDEV.8
+++ share/man/man8/man8.armish/MAKEDEV.8
@@ -183,13 +183,10 @@ ioctl tunnel pseudo-device, see
Video frame grabbers, see
.Xr bktr 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar fd
fd/* nodes, see
diff --git share/man/man8/man8.armv7/MAKEDEV.8
share/man/man8/man8.armv7/MAKEDEV.8
index 126d9eb..c53c51f 100644
--- share/man/man8/man8.armv7/MAKEDEV.8
+++ share/man/man8/man8.armv7/MAKEDEV.8
@@ -183,13 +183,10 @@ ioctl tunnel pseudo-device, see
Video frame grabbers, see
.Xr bktr 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar fd
fd/* nodes, see
diff --git share/man/man8/man8.hppa/MAKEDEV.8 share/man/man8/man8.hppa/MAKEDEV.8
index d1dcf88..a47e942 100644
--- share/man/man8/man8.hppa/MAKEDEV.8
+++ share/man/man8/man8.hppa/MAKEDEV.8
@@ -191,13 +191,10 @@ Audio devices, see
ioctl tunnel pseudo-device, see
.Xr bio 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar fd
fd/* nodes, see
diff --git share/man/man8/man8.hppa64/MAKEDEV.8
share/man/man8/man8.hppa64/MAKEDEV.8
index ef98c4f..678161e 100644
--- share/man/man8/man8.hppa64/MAKEDEV.8
+++ share/man/man8/man8.hppa64/MAKEDEV.8
@@ -191,13 +191,10 @@ Audio devices, see
ioctl tunnel pseudo-device, see
.Xr bio 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar fd
fd/* nodes, see
diff --git share/man/man8/man8.i386/MAKEDEV.8 share/man/man8/man8.i386/MAKEDEV.8
index 3a0c079..f4c91ff 100644
--- share/man/man8/man8.i386/MAKEDEV.8
+++ share/man/man8/man8.i386/MAKEDEV.8
@@ -206,13 +206,10 @@ ioctl tunnel pseudo-device, see
Video frame grabbers, see
.Xr bktr 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar drm*
Direct Rendering Manager, see
diff --git share/man/man8/man8.landisk/MAKEDEV.8
share/man/man8/man8.landisk/MAKEDEV.8
index 62c1bec..84d6be5 100644
--- share/man/man8/man8.landisk/MAKEDEV.8
+++ share/man/man8/man8.landisk/MAKEDEV.8
@@ -177,13 +177,10 @@ Audio devices, see
ioctl tunnel pseudo-device, see
.Xr bio 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar fd
fd/* nodes, see
diff --git share/man/man8/man8.loongson/MAKEDEV.8
share/man/man8/man8.loongson/MAKEDEV.8
index 4e4aaee..3eb0249 100644
--- share/man/man8/man8.loongson/MAKEDEV.8
+++ share/man/man8/man8.loongson/MAKEDEV.8
@@ -184,13 +184,10 @@ Audio devices, see
ioctl tunnel pseudo-device, see
.Xr bio 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar fd
fd/* nodes, see
diff --git share/man/man8/man8.macppc/MAKEDEV.8
share/man/man8/man8.macppc/MAKEDEV.8
index 46b5fb8..457ef4f 100644
--- share/man/man8/man8.macppc/MAKEDEV.8
+++ share/man/man8/man8.macppc/MAKEDEV.8
@@ -193,13 +193,10 @@ ioctl tunnel pseudo-device, see
Video frame grabbers, see
.Xr bktr 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar drm*
Direct Rendering Manager, see
diff --git share/man/man8/man8.octeon/MAKEDEV.8
share/man/man8/man8.octeon/MAKEDEV.8
index f0d5428..42686c2 100644
--- share/man/man8/man8.octeon/MAKEDEV.8
+++ share/man/man8/man8.octeon/MAKEDEV.8
@@ -166,13 +166,10 @@ Audio devices, see
ioctl tunnel pseudo-device, see
.Xr bio 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar fd
fd/* nodes, see
diff --git share/man/man8/man8.sgi/MAKEDEV.8 share/man/man8/man8.sgi/MAKEDEV.8
index b4020d1..de84a7c 100644
--- share/man/man8/man8.sgi/MAKEDEV.8
+++ share/man/man8/man8.sgi/MAKEDEV.8
@@ -184,13 +184,10 @@ Audio devices, see
ioctl tunnel pseudo-device, see
.Xr bio 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar fd
fd/* nodes, see
diff --git share/man/man8/man8.sparc64/MAKEDEV.8
share/man/man8/man8.sparc64/MAKEDEV.8
index ce4b473..022102e 100644
--- share/man/man8/man8.sparc64/MAKEDEV.8
+++ share/man/man8/man8.sparc64/MAKEDEV.8
@@ -226,13 +226,10 @@ Audio devices, see
ioctl tunnel pseudo-device, see
.Xr bio 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar drm*
Direct Rendering Manager, see
diff --git share/man/man8/man8.zaurus/MAKEDEV.8
share/man/man8/man8.zaurus/MAKEDEV.8
index 6a9e66c..776605d 100644
--- share/man/man8/man8.zaurus/MAKEDEV.8
+++ share/man/man8/man8.zaurus/MAKEDEV.8
@@ -183,13 +183,10 @@ ioctl tunnel pseudo-device, see
Video frame grabbers, see
.Xr bktr 4 .
.It Ar bpf*
Berkeley Packet Filter, see
.Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
.It Ar diskmap
Disk mapper, see
.Xr diskmap 4 .
.It Ar fd
fd/* nodes, see
diff --git share/man/man9/crypto.9 share/man/man9/crypto.9
index 350746e..07dad76 100644
--- share/man/man9/crypto.9
+++ share/man/man9/crypto.9
@@ -575,9 +575,5 @@ Thus, 3DES and DES could be mixed in the same request.
A queue for completed operations should be implemented and processed
at some software
.Xr spl 9
level, to avoid overall system latency issues, and potential kernel
stack exhaustion while processing a callback.
-.Pp
-When SMP time comes, we will support use of a second processor (or
-more) as a crypto device (this is actually AMP, but we need the same
-basic support).
diff --git share/man/man9/malloc.9 share/man/man9/malloc.9
index ca52310..3996be9 100644
--- share/man/man9/malloc.9
+++ share/man/man9/malloc.9
@@ -260,11 +260,11 @@ USB device driver.
.It Dv M_USBHC
USB host controller.
.It Dv M_MEMDESC
Memory range.
.It Dv M_CRYPTO_DATA
-.Xr crypto 4
+.Xr crypto 9
data buffers.
.It Dv M_CREDENTIALS
.Xr ipsec 4
related credentials.
.It Dv M_EMULDATA
diff --git usr.bin/kdump/Makefile usr.bin/kdump/Makefile
index b5704e2..c0f1197 100644
--- usr.bin/kdump/Makefile
+++ usr.bin/kdump/Makefile
@@ -10,11 +10,10 @@ CLEANFILES+=ioctl.c kdump_subr.c
ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
CC="${CC}" \
/bin/sh ${.CURDIR}/mkioctls ${SYS_DIR}/sys/ioctl.h \
${SYS_DIR}/sys/ioctl_compat.h \
- ${SYS_DIR}/crypto/cryptodev.h \
${SYS_DIR}/dev/biovar.h \
${SYS_DIR}/dev/systrace.h \
${SYS_DIR}/dev/wscons/wsconsio.h \
${SYS_DIR}/dev/vndioctl.h \
${SYS_DIR}/dev/pci/drm/drm.h \
diff --git usr.bin/kdump/mkioctls usr.bin/kdump/mkioctls
index 648e8fb..b1c8e21 100644
--- usr.bin/kdump/mkioctls
+++ usr.bin/kdump/mkioctls
@@ -72,11 +72,10 @@ BEGIN {
print "#include <sys/scanio.h>"
print "#include <sys/scsiio.h>"
print "#include <sys/tty.h>"
print "#include <sys/syslog.h>"
print "#include <sys/videoio.h>"
- print "#include <crypto/cryptodev.h>"
print "#include <dev/biovar.h>"
print "#include <dev/systrace.h>"
print "#include <dev/wscons/wsconsio.h>"
print "#include <dev/vndioctl.h>"
print "#include <dev/pci/drm/drm.h>"
@@ -89,11 +88,11 @@ BEGIN {
print "{"
print "\tswitch (val) {"
print ""
}
-/^[ ]*#[ ]*define[
]+(ATAIO|AUDIO_|BIOC|CDIO|CIOC|CHIO|DIOC|DRM|GPIO|TIO|FIO|MTIOC|LIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|USB|VIDIOC|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[
]+(DRM)?_IO/ {
+/^[ ]*#[ ]*define[
]+(ATAIO|AUDIO_|BIOC|CDIO|CHIO|DIOC|DRM|GPIO|TIO|FIO|MTIOC|LIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|USB|VIDIOC|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[
]+(DRM)?_IO/ {
# find where the name starts
for (i = 1; i <= NF; i++)
if ($i ~ /define/)
break;
