src - OpenBSD base system

diff options


context:
space:
mode:

author	Miod Vallat <miod@cvs.openbsd.org>	2009-01-25 17:30:50 +0000
committer	Miod Vallat <miod@cvs.openbsd.org>	2009-01-25 17:30:50 +0000
commit	112f090549c39e469480bf3625bd6137eaab39d1 (patch)
tree	c7ec175a5890515c89556591576f5dfd31ec70f9 /sys/arch
parent	f95ef1bc3da71857aded3948e0941019d6e8ad9b (diff)

Remove /dev/drum and related code.

Diffstat (limited to 'sys/arch')

-rw-r--r--

sys/arch/alpha/alpha/conf.c

-rw-r--r--

sys/arch/amd64/amd64/conf.c

-rw-r--r--

sys/arch/arm/arm/conf.c

-rw-r--r--

sys/arch/aviion/aviion/conf.c

-rw-r--r--

sys/arch/hp300/hp300/conf.c

-rw-r--r--

sys/arch/hppa/hppa/conf.c

-rw-r--r--

sys/arch/hppa64/hppa64/conf.c

-rw-r--r--

sys/arch/i386/i386/conf.c

-rw-r--r--

sys/arch/landisk/landisk/conf.c

-rw-r--r--

sys/arch/luna88k/luna88k/conf.c

-rw-r--r--

sys/arch/mac68k/mac68k/conf.c

-rw-r--r--

sys/arch/macppc/macppc/conf.c

-rw-r--r--

sys/arch/mvme68k/mvme68k/conf.c

-rw-r--r--

sys/arch/mvme88k/mvme88k/conf.c

-rw-r--r--

sys/arch/mvmeppc/mvmeppc/conf.c

-rw-r--r--

sys/arch/sgi/sgi/conf.c

-rw-r--r--

sys/arch/socppc/socppc/conf.c

-rw-r--r--

sys/arch/sparc/sparc/conf.c

-rw-r--r--

sys/arch/sparc64/sparc64/conf.c

-rw-r--r--

sys/arch/vax/vax/conf.c

20 files changed, 40 insertions, 42 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index a594c47cb20..a483b030375 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.57 2008/06/12 20:03:48 mglocker Exp $ */

+/* $OpenBSD: conf.c,v 1.58 2009/01/25 17:30:48 miod Exp $ */

/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */

/*-

@@ -140,7 +140,7 @@ struct cdevsw cdevsw[] =

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 61060c33ea1..7864ae00a6c 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.23 2008/11/22 21:26:47 oga Exp $ */

+/* $OpenBSD: conf.c,v 1.24 2009/01/25 17:30:48 miod Exp $ */

@@ -196,7 +196,7 @@ struct cdevsw cdevsw[] =

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

cdev_disk_init(NWD,wd), /* 3: ST506/ESDI/IDE disk */

- cdev_swap_init(1,sw), /* 4: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 4 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 5: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 6: pseudo-tty master */

cdev_log_init(1,log), /* 7: /dev/klog */

diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 252fafedcc2..a130173d874 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.20 2008/11/27 11:40:18 drahn Exp $ */

+/* $OpenBSD: conf.c,v 1.21 2009/01/25 17:30:48 miod Exp $ */

/* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */

@@ -104,7 +104,6 @@ cdev_decl(sscom);

#include "wd.h"

bdev_decl(wd);

-bdev_decl(sw);

#ifdef USER_PCICONF

#include "pci.h"

@@ -298,7 +297,7 @@ struct cdevsw cdevsw[] = {

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/aviion/aviion/conf.c b/sys/arch/aviion/aviion/conf.c
index 26f239f339f..2097ff94780 100644
--- a/sys/arch/aviion/aviion/conf.c
+++ b/sys/arch/aviion/aviion/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.6 2008/05/14 20:49:48 miod Exp $ */

+/* $OpenBSD: conf.c,v 1.7 2009/01/25 17:30:48 miod Exp $ */

/*-

@@ -93,7 +93,7 @@ struct cdevsw cdevsw[] =

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index f4ba8320e32..e22fc9c93ad 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.43 2008/05/14 20:49:48 miod Exp $ */

+/* $OpenBSD: conf.c,v 1.44 2009/01/25 17:30:48 miod Exp $ */

/* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */

/*-

@@ -119,7 +119,7 @@ struct cdevsw cdevsw[] =

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index a1177b9bd89..f71df4985b9 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.44 2008/06/12 20:03:48 mglocker Exp $ */

+/* $OpenBSD: conf.c,v 1.45 2009/01/25 17:30:48 miod Exp $ */

/*-

@@ -128,7 +128,7 @@ struct cdevsw cdevsw[] =

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c
index 260cc685219..2cc7412fa13 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.10 2008/06/12 20:03:48 mglocker Exp $ */

+/* $OpenBSD: conf.c,v 1.11 2009/01/25 17:30:48 miod Exp $ */

/*-

@@ -120,7 +120,7 @@ struct cdevsw cdevsw[] =

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index c06255e0fa9..b1c12a89f27 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.129 2008/11/23 18:19:02 deraadt Exp $ */

+/* $OpenBSD: conf.c,v 1.130 2009/01/25 17:30:48 miod Exp $ */

/* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */

@@ -200,7 +200,7 @@ struct cdevsw cdevsw[] =

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

cdev_disk_init(NWD,wd), /* 3: ST506/ESDI/IDE disk */

- cdev_swap_init(1,sw), /* 4: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 4 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 5: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 6: pseudo-tty master */

cdev_log_init(1,log), /* 7: /dev/klog */

diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index b597ea28d21..f925d5f5c70 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.9 2008/06/12 20:03:48 mglocker Exp $ */

+/* $OpenBSD: conf.c,v 1.10 2009/01/25 17:30:48 miod Exp $ */

@@ -97,7 +97,6 @@

#include "wd.h"

bdev_decl(wd);

-bdev_decl(sw);

#ifdef USER_PCICONF

#include "pci.h"

@@ -284,7 +283,7 @@ struct cdevsw cdevsw[] = {

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c
index 9a3a3671afb..e09c9378d35 100644
--- a/sys/arch/luna88k/luna88k/conf.c
+++ b/sys/arch/luna88k/luna88k/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.9 2008/05/14 20:49:48 miod Exp $ */

+/* $OpenBSD: conf.c,v 1.10 2009/01/25 17:30:48 miod Exp $ */

/*-

@@ -100,7 +100,7 @@ struct cdevsw cdevsw[] =

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index 1412242268e..96778cb341d 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.41 2008/05/14 20:49:48 miod Exp $ */

+/* $OpenBSD: conf.c,v 1.42 2009/01/25 17:30:48 miod Exp $ */

/* $NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $ */

@@ -111,7 +111,7 @@ struct cdevsw cdevsw[] =

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 5e877e0bf11..055ebfb2991 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.37 2008/06/12 20:03:48 mglocker Exp $ */

+/* $OpenBSD: conf.c,v 1.38 2009/01/25 17:30:49 miod Exp $ */

@@ -147,7 +147,7 @@ struct cdevsw cdevsw[] = {

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index a666dcc25d9..6f4b004b202 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.43 2008/05/14 20:49:48 miod Exp $ */

+/* $OpenBSD: conf.c,v 1.44 2009/01/25 17:30:49 miod Exp $ */

/*-

@@ -157,7 +157,7 @@ struct cdevsw cdevsw[] =

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index 03801f35305..a3df0dfe07a 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.36 2008/05/14 20:49:48 miod Exp $ */

+/* $OpenBSD: conf.c,v 1.37 2009/01/25 17:30:49 miod Exp $ */

/*-

@@ -134,7 +134,7 @@ struct cdevsw cdevsw[] =

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c
index 3d16db4c5a2..4edd7760060 100644
--- a/sys/arch/mvmeppc/mvmeppc/conf.c
+++ b/sys/arch/mvmeppc/mvmeppc/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.23 2008/05/14 20:49:48 miod Exp $ */

+/* $OpenBSD: conf.c,v 1.24 2009/01/25 17:30:49 miod Exp $ */

@@ -117,7 +117,7 @@ struct cdevsw cdevsw[] = {

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 2d7997ffd1b..906ee2122bd 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.17 2008/08/25 13:51:12 jsing Exp $ */

+/* $OpenBSD: conf.c,v 1.18 2009/01/25 17:30:49 miod Exp $ */

@@ -138,7 +138,7 @@ cdev_decl(pci);

struct cdevsw cdevsw[] =

{

cdev_cn_init(1,cn), /* 0: virtual console */

- cdev_swap_init(1,sw), /* 1: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 1 was /dev/drum */

cdev_ctty_init(1,ctty), /* 2: controlling terminal */

cdev_mm_init(1,mm), /* 3: /dev/{null,mem,kmem,...} */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index 28b71ce9889..63a93c9f7d2 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.4 2008/06/12 20:03:48 mglocker Exp $ */

+/* $OpenBSD: conf.c,v 1.5 2009/01/25 17:30:49 miod Exp $ */

@@ -107,7 +107,7 @@ struct cdevsw cdevsw[] = {

cdev_cn_init(1,cn), /* 0: virtual console */

cdev_ctty_init(1,ctty), /* 1: controlling terminal */

cdev_mm_init(1,mm), /* 2: /dev/{null,mem,kmem,...} */

- cdev_swap_init(1,sw), /* 3: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 3 was /dev/drum */

cdev_tty_init(NPTY,pts), /* 4: pseudo-tty slave */

cdev_ptc_init(NPTY,ptc), /* 5: pseudo-tty master */

cdev_log_init(1,log), /* 6: /dev/klog */

diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index e7edf20f81c..1cc0b270331 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.47 2008/04/08 14:31:54 claudio Exp $ */

+/* $OpenBSD: conf.c,v 1.48 2009/01/25 17:30:49 miod Exp $ */

/* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */

@@ -138,7 +138,7 @@ struct cdevsw cdevsw[] =

cdev_notdef(), /* 4 */

cdev_notdef(), /* 5 */

cdev_notdef(), /* 6 */

- cdev_swap_init(1,sw), /* 7: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 7 was /dev/drum */

cdev_notdef(), /* 8 */

cdev_disk_init(NXY,xy), /* 9: SMD disk */

cdev_notdef(), /* 10 */

diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index c05932f5fc5..2670ca01165 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.48 2008/07/07 14:46:18 kettenis Exp $ */

+/* $OpenBSD: conf.c,v 1.49 2009/01/25 17:30:49 miod Exp $ */

/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */

@@ -158,7 +158,7 @@ struct cdevsw cdevsw[] =

cdev_notdef(), /* 4 */

cdev_notdef(), /* 5: tapemaster tape */

cdev_notdef(), /* 6: systech/versatec */

- cdev_swap_init(1,sw), /* 7: /dev/drum (swap pseudo-device) */

+ cdev_notdef(), /* 7 was /dev/drum */

cdev_notdef(), /* 8: Archive QIC-11 tape */

cdev_notdef(), /* 9: SMD disk on Xylogics 450/451 */

cdev_notdef(), /* 10: systech multi-terminal board */

diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index c142eeb0904..8700b9d121a 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: conf.c,v 1.55 2008/08/18 23:19:29 miod Exp $ */

+/* $OpenBSD: conf.c,v 1.56 2009/01/25 17:30:49 miod Exp $ */

/* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */

/*-

@@ -364,7 +364,7 @@ struct cdevsw cdevsw[] =

cdev_disk_init(NHP,hp), /* 4: Massbuss disk */

cdev_notdef(), /* 5 */

cdev_plotter_init(NVP,vp), /* 6: Versatec plotter */

- cdev_swap_init(1,sw), /* 7 */

+ cdev_notdef(), /* 7 was /dev/drum */

cdev_cnstore_init(NCFL,cfl), /* 8: 11/780 console floppy */

cdev_disk_init(NRA,ra), /* 9: MSCP disk interface */

cdev_plotter_init(NVA,va), /* 10: Benson-Varian plotter */