first step is to unlink crypto(4) pseudo device from the architecture
dependant character device tables and kernel config files.
OK?
diff --git sys/arch/alpha/alpha/conf.c sys/arch/alpha/alpha/conf.c
index 83cea34..7d103af 100644
--- sys/arch/alpha/alpha/conf.c
+++ sys/arch/alpha/alpha/conf.c
@@ -190,11 +190,11 @@ struct cdevsw cdevsw[] =
#endif
cdev_bio_init(NBIO,bio), /* 53: ioctl tunnel */
cdev_notdef(),
cdev_ptm_init(NPTY,ptm), /* 55: pseudo-tty ptm device */
cdev_hotplug_init(NHOTPLUG,hotplug), /* 56: devices hot plugging */
- cdev_crypto_init(NCRYPTO,crypto), /* 57: /dev/crypto */
+ cdev_notdef(), /* 57: was: /dev/crypto */
cdev_bktr_init(NBKTR,bktr), /* 58: Bt848 video capture device */
cdev_radio_init(NRADIO,radio), /* 59: generic radio I/O */
cdev_mouse_init(NWSMUX, wsmux), /* 60: ws multiplexor */
cdev_vscsi_init(NVSCSI, vscsi), /* 61: vscsi */
cdev_notdef(),
diff --git sys/arch/alpha/conf/GENERIC sys/arch/alpha/conf/GENERIC
index 7b0c790..dbc8bdc 100644
--- sys/arch/alpha/conf/GENERIC
+++ sys/arch/alpha/conf/GENERIC
@@ -422,8 +422,7 @@ option ONEWIREVERBOSE
owid* at onewire? # ID
owsbm* at onewire? # Smart Battery Monitor
owtemp* at onewire? # Temperature
owctr* at onewire? # Counter device
-pseudo-device crypto 1
pseudo-device hotplug 1 # devices hot plugging
pseudo-device wsmux 2 # mouse & keyboard multiplexor
diff --git sys/arch/amd64/amd64/conf.c sys/arch/amd64/amd64/conf.c
index 59d4c9b..5da5820 100644
--- sys/arch/amd64/amd64/conf.c
+++ sys/arch/amd64/amd64/conf.c
@@ -38,12 +38,10 @@
#include <sys/tty.h>
#include <sys/vnode.h>
#include <machine/conf.h>
-#include "inet.h"
-
#include "wd.h"
bdev_decl(wd);
#include "fdc.h"
#include "fd.h"
bdev_decl(fd);
@@ -254,11 +252,11 @@ struct cdevsw cdevsw[] =
cdev_tty_init(NUCOM,ucom), /* 66: USB tty */
cdev_mouse_init(NWSKBD, wskbd), /* 67: keyboards */
cdev_mouse_init(NWSMOUSE, /* 68: mice */
wsmouse),
cdev_mouse_init(NWSMUX, wsmux), /* 69: ws multiplexor */
- cdev_crypto_init(NCRYPTO,crypto), /* 70: /dev/crypto */
+ cdev_notdef(), /* 70: was: /dev/crypto */
cdev_tty_init(NCZ,cztty), /* 71: Cyclades-Z serial port */
#ifdef USER_PCICONF
cdev_pci_init(NPCI,pci), /* 72: PCI user */
#else
cdev_notdef(),
diff --git sys/arch/amd64/conf/GENERIC sys/arch/amd64/conf/GENERIC
index 09fd692..3177dd8 100644
--- sys/arch/amd64/conf/GENERIC
+++ sys/arch/amd64/conf/GENERIC
@@ -600,11 +600,10 @@ pseudo-device pctr 1
pseudo-device nvram 1
pseudo-device hotplug 1 # devices hot plugging
# mouse & keyboard multiplexor pseudo-devices
pseudo-device wsmux 2
-pseudo-device crypto 1
# Virtio devices
virtio* at pci? # Virtio PCI device
vioblk* at virtio? # Virtio block device
vio* at virtio? # Virtio network device
diff --git sys/arch/arm/arm/conf.c sys/arch/arm/arm/conf.c
index d381885..8f12732 100644
--- sys/arch/arm/arm/conf.c
+++ sys/arch/arm/arm/conf.c
@@ -53,12 +53,10 @@
#include <sys/conf.h>
#include <sys/vnode.h>
#include <machine/conf.h>
-#include "inet.h"
-
/*
* From this point, these need to be MI foo.h files.
*/
/*
@@ -321,11 +319,11 @@ struct cdevsw cdevsw[] = {
cdev_lkm_dummy(), /* 42: reserved */
cdev_lkm_dummy(), /* 43: reserved */
cdev_lkm_dummy(), /* 44: reserved */
cdev_lkm_dummy(), /* 45: reserved */
cdev_pf_init(NPF,pf), /* 46: packet filter */
- cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
+ cdev_notdef(), /* 47: was: /dev/crypto */
cdev_lkm_dummy(), /* 48: reserved */
cdev_lkm_dummy(), /* 49: reserved */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
cdev_notdef(), /* 51: reserved */
cdev_bio_init(NBIO,bio), /* 52: ioctl tunnel */
diff --git sys/arch/armish/conf/GENERIC sys/arch/armish/conf/GENERIC
index e72ff41..6bf908c 100644
--- sys/arch/armish/conf/GENERIC
+++ sys/arch/armish/conf/GENERIC
@@ -195,7 +195,6 @@ owsbm* at onewire? # Smart Battery Monitor
owtemp* at onewire? # Temperature
owctr* at onewire? # Counter device
# mouse & keyboard multiplexor pseudo-devices
pseudo-device wsmux 2
-pseudo-device crypto 1
pseudo-device hotplug 1 # devices hot plugging
diff --git sys/arch/hppa/hppa/conf.c sys/arch/hppa/hppa/conf.c
index 81da77a..0d45c5a 100644
--- sys/arch/hppa/hppa/conf.c
+++ sys/arch/hppa/hppa/conf.c
@@ -85,11 +85,10 @@ int nblkdev = nitems(bdevsw);
#include "wsdisplay.h"
#include "wskbd.h"
#include "wsmouse.h"
#include "wsmux.h"
-#include "inet.h"
#include "bpfilter.h"
#include "tun.h"
#include "ksyms.h"
@@ -161,11 +160,11 @@ struct cdevsw cdevsw[] =
#endif
cdev_notdef(),
cdev_video_init(NVIDEO,video), /* 33: generic video I/O */
cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */
cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */
- cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */
+ cdev_notdef(), /* 36: was: /dev/crypto */
cdev_bio_init(NBIO,bio), /* 37: ioctl tunnel */
cdev_ptm_init(NPTY,ptm), /* 38: pseudo-tty ptm device */
cdev_disk_init(NWD,wd), /* 39: ST506 disk */
cdev_usb_init(NUSB,usb), /* 40: USB controller */
cdev_usbdev_init(NUHID,uhid), /* 41: USB generic HID */
diff --git sys/arch/hppa64/hppa64/conf.c sys/arch/hppa64/hppa64/conf.c
index 17034f8..017f5e0 100644
--- sys/arch/hppa64/hppa64/conf.c
+++ sys/arch/hppa64/hppa64/conf.c
@@ -85,11 +85,10 @@ int nblkdev = nitems(bdevsw);
#include "wsdisplay.h"
#include "wskbd.h"
#include "wsmouse.h"
#include "wsmux.h"
-#include "inet.h"
#include "bpfilter.h"
#include "tun.h"
#include "ksyms.h"
@@ -161,11 +160,11 @@ struct cdevsw cdevsw[] =
#endif
cdev_notdef(),
cdev_video_init(NVIDEO,video), /* 33: generic video I/O */
cdev_systrace_init(NSYSTRACE,systrace), /* 34: system call tracing */
cdev_audio_init(NAUDIO,audio), /* 35: /dev/audio */
- cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */
+ cdev_notdef(), /* 36: was: /dev/crypto */
cdev_bio_init(NBIO,bio), /* 37: ioctl tunnel */
cdev_ptm_init(NPTY,ptm), /* 38: pseudo-tty ptm device */
cdev_disk_init(NWD,wd), /* 39: ST506 disk */
cdev_usb_init(NUSB,usb), /* 40: USB controller */
cdev_usbdev_init(NUHID,uhid), /* 41: USB generic HID */
diff --git sys/arch/i386/conf/GENERIC sys/arch/i386/conf/GENERIC
index aeeba66..a0f4b3b 100644
--- sys/arch/i386/conf/GENERIC
+++ sys/arch/i386/conf/GENERIC
@@ -784,11 +784,10 @@ pseudo-device pctr 1
pseudo-device nvram 1
pseudo-device hotplug 1 # devices hot plugging
# mouse & keyboard multiplexor pseudo-devices
pseudo-device wsmux 2
-pseudo-device crypto 1
# Virtio devices
virtio* at pci? # Virtio PCI device
vioblk* at virtio? # Virtio block device
vio* at virtio? # Virtio network device
diff --git sys/arch/i386/i386/conf.c sys/arch/i386/i386/conf.c
index a0e406e..01a5a5a 100644
--- sys/arch/i386/i386/conf.c
+++ sys/arch/i386/i386/conf.c
@@ -39,12 +39,10 @@
#include <sys/tty.h>
#include <sys/vnode.h>
#include <machine/conf.h>
-#include "inet.h"
-
#include "wd.h"
bdev_decl(wd);
#include "fdc.h"
#include "fd.h"
bdev_decl(fd);
@@ -258,11 +256,11 @@ struct cdevsw cdevsw[] =
cdev_tty_init(NUCOM,ucom), /* 66: USB tty */
cdev_mouse_init(NWSKBD, wskbd), /* 67: keyboards */
cdev_mouse_init(NWSMOUSE, /* 68: mice */
wsmouse),
cdev_mouse_init(NWSMUX, wsmux), /* 69: ws multiplexor */
- cdev_crypto_init(NCRYPTO,crypto), /* 70: /dev/crypto */
+ cdev_notdef(), /* 70: was: /dev/crypto */
cdev_tty_init(NCZ,cztty), /* 71: Cyclades-Z serial port */
#ifdef USER_PCICONF
cdev_pci_init(NPCI,pci), /* 72: PCI user */
#else
cdev_notdef(),
diff --git sys/arch/landisk/landisk/conf.c sys/arch/landisk/landisk/conf.c
index fbc3336..3323bfd 100644
--- sys/arch/landisk/landisk/conf.c
+++ sys/arch/landisk/landisk/conf.c
@@ -52,12 +52,10 @@
#include <sys/conf.h>
#include <sys/vnode.h>
#include <machine/conf.h>
-#include "inet.h"
-
/*
* From this point, these need to be MI foo.h files.
*/
/*
@@ -297,11 +295,11 @@ struct cdevsw cdevsw[] = {
cdev_lkm_dummy(), /* 42: reserved */
cdev_lkm_dummy(), /* 43: reserved */
cdev_lkm_dummy(), /* 44: reserved */
cdev_lkm_dummy(), /* 45: reserved */
cdev_pf_init(NPF,pf), /* 46: packet filter */
- cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
+ cdev_notdef(), /* 47: was /dev/crypto */
cdev_lkm_dummy(), /* 48: reserved */
cdev_lkm_dummy(), /* 49: reserved */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
cdev_notdef(), /* 51: reserved */
cdev_notdef(), /* 52: reserved */
diff --git sys/arch/loongson/loongson/conf.c sys/arch/loongson/loongson/conf.c
index 2873d877..a896943 100644
--- sys/arch/loongson/loongson/conf.c
+++ sys/arch/loongson/loongson/conf.c
@@ -112,12 +112,10 @@ cdev_decl(wd);
#include "wsmouse.h"
#include "wsmux.h"
#include "pci.h"
cdev_decl(pci);
-#include "inet.h"
-
#include "pf.h"
#include "systrace.h"
#include "usb.h"
#include "uhid.h"
@@ -181,11 +179,11 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 42: */
cdev_notdef(), /* 33: */
cdev_audio_init(NAUDIO,audio), /* 44: /dev/audio */
cdev_video_init(NVIDEO,video), /* 45: generic video I/O */
cdev_notdef(), /* 46: */
- cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
+ cdev_notdef(), /* 47: was: /dev/crypto */
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
cdev_notdef(), /* 51: */
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
diff --git sys/arch/macppc/macppc/conf.c sys/arch/macppc/macppc/conf.c
index e59201b..a2b1992 100644
--- sys/arch/macppc/macppc/conf.c
+++ sys/arch/macppc/macppc/conf.c
@@ -105,12 +105,10 @@ cdev_decl(com);
#include "ugen.h"
#include "ulpt.h"
#include "urio.h"
#include "ucom.h"
-#include "inet.h"
-
#include "apm.h"
#include "drm.h"
cdev_decl(drm);
#include "wsmux.h"
@@ -183,11 +181,11 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 42 */
cdev_ksyms_init(NKSYMS,ksyms), /* 43: Kernel symbols device */
cdev_audio_init(NAUDIO,audio), /* 44: generic audio I/O */
cdev_video_init(NVIDEO,video), /* 45: generic video I/O */
cdev_notdef(), /* 46 */
- cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
+ cdev_notdef(), /* 47: was: /dev/crypto */
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
cdev_notdef(), /* 51 */
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
diff --git sys/arch/octeon/octeon/conf.c sys/arch/octeon/octeon/conf.c
index bde1c74..47b91f6 100644
--- sys/arch/octeon/octeon/conf.c
+++ sys/arch/octeon/octeon/conf.c
@@ -119,12 +119,10 @@ cdev_decl(octcf);
#include "wsmouse.h"
#include "wsmux.h"
#include "pci.h"
cdev_decl(pci);
-#include "inet.h"
-
#include "pf.h"
#include "systrace.h"
#include "usb.h"
#include "uhid.h"
@@ -192,11 +190,11 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 42: */
cdev_notdef(), /* 33: */
cdev_audio_init(NAUDIO,audio), /* 44: /dev/audio */
cdev_video_init(NVIDEO,video), /* 45: generic video I/O */
cdev_notdef(), /* 46: */
- cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
+ cdev_notdef(), /* 47: was: /dev/crypto */
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
cdev_notdef(), /* 51: */
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
diff --git sys/arch/sgi/sgi/conf.c sys/arch/sgi/sgi/conf.c
index 43fd25c..f38706c 100644
--- sys/arch/sgi/sgi/conf.c
+++ sys/arch/sgi/sgi/conf.c
@@ -113,12 +113,10 @@ cdev_decl(wd);
#include "wsmouse.h"
#include "wsmux.h"
#include "pci.h"
cdev_decl(pci);
-#include "inet.h"
-
#include "pf.h"
#include "systrace.h"
#include "usb.h"
#include "uhid.h"
@@ -182,11 +180,11 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 42: */
cdev_notdef(), /* 33: */
cdev_audio_init(NAUDIO,audio), /* 44: /dev/audio */
cdev_video_init(NVIDEO,video), /* 45: generic video I/O */
cdev_notdef(), /* 46: */
- cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
+ cdev_notdef(), /* 47: was: /dev/crypto */
cdev_notdef(), /* 48: */
cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
cdev_notdef(), /* 51: */
cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */
diff --git sys/arch/socppc/conf/GENERIC sys/arch/socppc/conf/GENERIC
index 7f727ca..3070bf6 100644
--- sys/arch/socppc/conf/GENERIC
+++ sys/arch/socppc/conf/GENERIC
@@ -107,8 +107,7 @@ ukphy* at mii? # Generic unknown PHY
# PCI
athn* at pci? # Atheros AR9k (802.11a/g/n)
hifn* at pci? # Hi/fn 7751 crypto card
-pseudo-device crypto 1 # hardware crypto access
pseudo-device hotplug 1 # devices hot plugging
pseudo-device wsmux 2 # mouse & keyboard multiplexor
diff --git sys/arch/socppc/socppc/conf.c sys/arch/socppc/socppc/conf.c
index 5a45ee4..a61cc93 100644
--- sys/arch/socppc/socppc/conf.c
+++ sys/arch/socppc/socppc/conf.c
@@ -85,12 +85,10 @@ cdev_decl(com);
#include "bpfilter.h"
#include "tun.h"
-#include "inet.h"
-
#include "wsmux.h"
#ifdef USER_PCICONF
#include "pci.h"
cdev_decl(pci);
@@ -165,11 +163,11 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 42 */
cdev_ksyms_init(NKSYMS,ksyms), /* 43: Kernel symbols device */
cdev_video_init(NVIDEO,video), /* 44: generic video I/O */
cdev_notdef(), /* 45 */
cdev_notdef(), /* 46 */
- cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
+ cdev_notdef(), /* 47: was: /dev/crypto */
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
cdev_notdef(), /* 51 */
cdev_notdef(), /* 52 */
diff --git sys/arch/sparc64/sparc64/conf.c sys/arch/sparc64/sparc64/conf.c
index f30a98b..b6f514d 100644
--- sys/arch/sparc64/sparc64/conf.c
+++ sys/arch/sparc64/sparc64/conf.c
@@ -109,11 +109,10 @@ cdev_decl(pci);
#include "ucom.h"
#include "pf.h"
#include "ksyms.h"
-#include "inet.h"
#include "systrace.h"
#include "hotplug.h"
#include "vscsi.h"
#include "pppx.h"
@@ -229,11 +228,11 @@ struct cdevsw cdevsw[] =
cdev_openprom_init(1,openprom), /* 70: /dev/openprom */
cdev_tty_init(NMTTY,mtty), /* 71: magma serial ports */
cdev_gen_init(NMBPP,mbpp), /* 72: magma parallel ports */
cdev_pf_init(NPF,pf), /* 73: packet filter */
cdev_notdef(), /* 74: ALTQ (deprecated) */
- cdev_crypto_init(NCRYPTO,crypto), /* 75: /dev/crypto */
+ cdev_notdef(), /* 75: was: /dev/crypto */
cdev_ksyms_init(NKSYMS,ksyms), /* 76 *: Kernel symbols device */
cdev_tty_init(NSABTTY,sabtty), /* 77: sab82532 serial ports */
cdev_wsdisplay_init(NWSDISPLAY, /* 78: frame buffers, etc. */
wsdisplay),
cdev_mouse_init(NWSKBD, wskbd), /* 79: keyboards */
