diff options
| 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 | |
| parent | f95ef1bc3da71857aded3948e0941019d6e8ad9b (diff) | |
Remove /dev/drum and related code.
49 files changed, 92 insertions, 202 deletions
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index 14417c5c9e1..c30b755ebe8 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1275,7 +1275,6 @@ ./usr/share/man/cat4/de.0 ./usr/share/man/cat4/dpt.0 ./usr/share/man/cat4/drm.0 -./usr/share/man/cat4/drum.0 ./usr/share/man/cat4/eap.0 ./usr/share/man/cat4/ec.0 ./usr/share/man/cat4/eephy.0 diff --git a/etc/MAKEDEV.man b/etc/MAKEDEV.man index 9827d9b3c6b..a3d08513dd5 100644 --- a/etc/MAKEDEV.man +++ b/etc/MAKEDEV.man @@ -1,7 +1,7 @@ define(COMM,`.\"')dnl include(MAKEDEV.mansub)dnl dnl -vers(a, {-$OpenBSD: MAKEDEV.man,v 1.4 2008/06/16 08:18:39 todd Exp $-})dnl +vers(a, {-$OpenBSD: MAKEDEV.man,v 1.5 2009/01/25 17:30:48 miod Exp $-})dnl dnl define(quote,{-.Dq $1 -})dnl @@ -13,7 +13,7 @@ __devitem({-all-},{-all-},dnl __devitem(std,{-std-},dnl {-Creates the .Sq standard -devices (console, drum, klog, kmem, ksyms, mem, null, +devices (console, klog, kmem, ksyms, mem, null, stderr, stdin, stdout, tty, zero) which are absolutely necessary for the system to function properly-},nothing)dnl __devitem(local,local,dnl diff --git a/etc/MAKEDEV.mi b/etc/MAKEDEV.mi index 38494851512..c52a32c9c5e 100644 --- a/etc/MAKEDEV.mi +++ b/etc/MAKEDEV.mi @@ -1,7 +1,7 @@ define(COMM,`#')dnl include(MAKEDEV.sub)dnl dnl -vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp $-})dnl +vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp $-})dnl dnl divert(1)dnl {-#-} @@ -33,8 +33,7 @@ dnl dnl $1: tty dnl $2: memstuff dnl $3: ksyms -dnl $4: drum -dnl $5: klog +dnl $4: klog dnl define({-_std-},{-dnl std) @@ -48,8 +47,7 @@ std) M stdout c major_fdesc_c 1 M stderr c major_fdesc_c 2 M ksyms c $3 0 640 kmem - M drum c $4 0 640 kmem - M klog c $5 0 600-})dnl + M klog c $4 0 600-})dnl dnl divert(1)dnl define(__mddivert,7)dnl diff --git a/etc/etc.alpha/MAKEDEV.md b/etc/etc.alpha/MAKEDEV.md index 53e98576867..d13b5481b67 100644 --- a/etc/etc.alpha/MAKEDEV.md +++ b/etc/etc.alpha/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,alpha)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.39 2008/06/28 21:46:04 mglocker Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.40 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -92,7 +92,7 @@ ramdisk) _recurse st0 cd0 ttyC0 rd0 bio ;; -_std(1, 2, 39, 3, 6) +_std(1, 2, 39, 6) M xf86 c 2 4 600 ;; diff --git a/etc/etc.amd64/MAKEDEV.md b/etc/etc.amd64/MAKEDEV.md index 680447dd458..04e3348e02b 100644 --- a/etc/etc.amd64/MAKEDEV.md +++ b/etc/etc.amd64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,amd64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.32 2008/07/14 16:21:52 miod Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.33 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -108,7 +108,7 @@ ramdisk) _recurse st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 ;; -_std(1, 2, 50, 4, 7) +_std(1, 2, 50, 7) M xf86 c 2 4 600 ;; diff --git a/etc/etc.armish/MAKEDEV.md b/etc/etc.armish/MAKEDEV.md index 1a23a0d23ee..8e83d2ea22f 100644 --- a/etc/etc.armish/MAKEDEV.md +++ b/etc/etc.armish/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,armish)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.10 2008/06/28 21:46:05 mglocker Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.11 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -96,7 +96,7 @@ ramdisk) _recurse st0 ttyC0 wskbd0 apm bio ;; -_std(1, 2, 8, 3, 6) +_std(1, 2, 8, 6) ;; dnl dnl *** armish specific targets diff --git a/etc/etc.aviion/MAKEDEV.md b/etc/etc.aviion/MAKEDEV.md index 3b95d64069c..7b996fe7b9f 100644 --- a/etc/etc.aviion/MAKEDEV.md +++ b/etc/etc.aviion/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,aviion)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.6 2008/06/14 23:09:05 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.7 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -102,6 +102,6 @@ _DEV(xfs, 51) dnl divert(__mddivert)dnl dnl -_std(1, 2, 43, 3, 6) +_std(1, 2, 43, 6) ;; diff --git a/etc/etc.hp300/MAKEDEV.md b/etc/etc.hp300/MAKEDEV.md index d29beb5eb61..83d8b3acaff 100644 --- a/etc/etc.hp300/MAKEDEV.md +++ b/etc/etc.hp300/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,hp300)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.33 2008/06/14 23:09:05 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.34 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -101,7 +101,7 @@ ramdisk) _recurse bpf0 bpf1 tun0 tun1 lkm ;; -_std(1, 2, 36, 3, 6) +_std(1, 2, 36, 6) ;; dca*) diff --git a/etc/etc.hppa/MAKEDEV.md b/etc/etc.hppa/MAKEDEV.md index ddaebc74e68..2200addd420 100644 --- a/etc/etc.hppa/MAKEDEV.md +++ b/etc/etc.hppa/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,hppa)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.35 2008/06/28 21:46:05 mglocker Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.36 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -85,7 +85,7 @@ ramdisk) _recurse pty0 bpf0 bpf1 tun0 tun1 lkm bio ;; -_std(1, 2, 25, 3, 6) +_std(1, 2, 25, 6) M pdc c 22 0 640 operator ;; dnl diff --git a/etc/etc.hppa64/MAKEDEV.md b/etc/etc.hppa64/MAKEDEV.md index c72fbd7bfad..aaae8238bc7 100644 --- a/etc/etc.hppa64/MAKEDEV.md +++ b/etc/etc.hppa64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,hppa64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.12 2008/06/28 21:46:05 mglocker Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.13 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -76,7 +76,7 @@ ramdisk) _recurse pty0 bpf0 bpf1 tun0 tun1 lkm bio ;; -_std(1, 2, 25, 3, 6) +_std(1, 2, 25, 6) M pdc c 22 0 640 operator ;; dnl diff --git a/etc/etc.i386/MAKEDEV.md b/etc/etc.i386/MAKEDEV.md index 5751f8321f8..bc6fe408632 100644 --- a/etc/etc.i386/MAKEDEV.md +++ b/etc/etc.i386/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,i386)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.48 2008/06/28 21:46:05 mglocker Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.49 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -112,7 +112,7 @@ ramdisk) _recurse st0 cd0 ttyC0 wskbd0 wskbd1 wskbd2 apm ;; -_std(1, 2, 50, 4, 7) +_std(1, 2, 50, 7) M xf86 c 2 4 600 ;; diff --git a/etc/etc.landisk/MAKEDEV.md b/etc/etc.landisk/MAKEDEV.md index c4b9796e7e5..7f89b01395b 100644 --- a/etc/etc.landisk/MAKEDEV.md +++ b/etc/etc.landisk/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,landisk)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.12 2008/06/28 21:46:05 mglocker Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.13 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -100,7 +100,7 @@ ramdisk) _recurse st0 ttyC0 wskbd0 apm bio ;; -_std(1, 2, 8, 3, 6) +_std(1, 2, 8, 6) ;; dnl dnl *** landisk specific targets diff --git a/etc/etc.luna88k/MAKEDEV.md b/etc/etc.luna88k/MAKEDEV.md index 05dcfe27902..0b4f54574bf 100644 --- a/etc/etc.luna88k/MAKEDEV.md +++ b/etc/etc.luna88k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,luna88k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.9 2008/06/14 23:09:06 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.10 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -100,6 +100,6 @@ _DEV(xfs, 51) dnl divert(__mddivert)dnl dnl -_std(1, 2, 43, 3, 6) +_std(1, 2, 43, 6) ;; diff --git a/etc/etc.mac68k/MAKEDEV.md b/etc/etc.mac68k/MAKEDEV.md index 27262c310bf..7672b3df2c0 100644 --- a/etc/etc.mac68k/MAKEDEV.md +++ b/etc/etc.mac68k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,mac68k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.27 2008/06/14 23:09:06 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.28 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -66,7 +66,7 @@ _DEV(xfs, 51) dnl divert(__mddivert)dnl dnl -_std(1, 2, 37, 3, 6) +_std(1, 2, 37, 6) ;; tty0*) diff --git a/etc/etc.macppc/MAKEDEV.md b/etc/etc.macppc/MAKEDEV.md index 316f1b71935..2514728877d 100644 --- a/etc/etc.macppc/MAKEDEV.md +++ b/etc/etc.macppc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,macppc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.36 2008/06/28 21:46:05 mglocker Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.37 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -102,7 +102,7 @@ _DEV(xfs, 51) dnl divert(__mddivert)dnl dnl -_std(1, 2, 43, 3, 6) +_std(1, 2, 43, 6) M xf86 c 2 4 600 M openprom c 82 0 640 kmem ;; diff --git a/etc/etc.mvme68k/MAKEDEV.md b/etc/etc.mvme68k/MAKEDEV.md index 5bfe1ddb1ee..21088546e7c 100644 --- a/etc/etc.mvme68k/MAKEDEV.md +++ b/etc/etc.mvme68k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,mvme68k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.21 2008/06/14 23:09:06 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.22 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -165,6 +165,6 @@ _DEV(xfs, 51) dnl divert(__mddivert)dnl dnl -_std(1, 2, 43, 3, 6) +_std(1, 2, 43, 6) ;; diff --git a/etc/etc.mvme88k/MAKEDEV.md b/etc/etc.mvme88k/MAKEDEV.md index 53533e23cfe..3fdeb1e9ec7 100644 --- a/etc/etc.mvme88k/MAKEDEV.md +++ b/etc/etc.mvme88k/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,mvme88k)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.21 2008/06/14 23:09:06 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.22 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -136,6 +136,6 @@ _DEV(xfs, 51) dnl divert(__mddivert)dnl dnl -_std(1, 2, 43, 3, 6) +_std(1, 2, 43, 6) ;; diff --git a/etc/etc.mvmeppc/MAKEDEV.md b/etc/etc.mvmeppc/MAKEDEV.md index f72c5c2d0c9..12a2f6033d3 100644 --- a/etc/etc.mvmeppc/MAKEDEV.md +++ b/etc/etc.mvmeppc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,macppc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.27 2008/06/14 23:09:06 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.28 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -59,7 +59,7 @@ _DEV(tun) dnl divert(__mddivert)dnl dnl -_std(1, 2, 43, 3, 6) +_std(1, 2, 43, 6) ;; sd*|wd*|ccd*|ofdisk*|raid*) diff --git a/etc/etc.sgi/MAKEDEV.md b/etc/etc.sgi/MAKEDEV.md index db0de8ed6e7..6c6c6d7d98a 100644 --- a/etc/etc.sgi/MAKEDEV.md +++ b/etc/etc.sgi/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sgi)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.21 2008/08/25 14:00:33 jsing Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.22 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -81,7 +81,7 @@ _DEV(xfs, 51) dnl divert(__mddivert)dnl dnl -_std(2, 3, 35, 1, 6) +_std(2, 3, 35, 6) ;; dnl dnl *** sgi specific targets diff --git a/etc/etc.socppc/MAKEDEV.md b/etc/etc.socppc/MAKEDEV.md index 6c68bcf7f3a..434797f66ff 100644 --- a/etc/etc.socppc/MAKEDEV.md +++ b/etc/etc.socppc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,socppc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.4 2008/06/28 21:46:05 mglocker Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.5 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -84,7 +84,7 @@ _DEV(xfs, 51) dnl divert(__mddivert)dnl dnl -_std(1, 2, 43, 3, 6) +_std(1, 2, 43, 6) ;; dnl diff --git a/etc/etc.sparc/MAKEDEV.md b/etc/etc.sparc/MAKEDEV.md index 60b55525b94..a0e9c7f4738 100644 --- a/etc/etc.sparc/MAKEDEV.md +++ b/etc/etc.sparc/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sparc)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.37 2008/06/14 23:09:06 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.38 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -114,7 +114,7 @@ ramdisk) _recurse fd0 sd0 sd1 sd2 rd0 cd0 ;; -_std(2, 3, 122, 7, 16) +_std(2, 3, 122, 16) M eeprom c 3 11 640 kmem M openprom c 70 0 640 kmem ;; diff --git a/etc/etc.sparc64/MAKEDEV.md b/etc/etc.sparc64/MAKEDEV.md index c5317400088..2f028d2b734 100644 --- a/etc/etc.sparc64/MAKEDEV.md +++ b/etc/etc.sparc64/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,sparc64)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.49 2008/06/28 21:46:05 mglocker Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.50 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -120,7 +120,7 @@ ramdisk) _recurse st0 cd0 bpf0 bio ;; -_std(2, 3, 76, 7, 16) +_std(2, 3, 76, 16) M openprom c 70 0 640 kmem ;; dnl diff --git a/etc/etc.vax/MAKEDEV.md b/etc/etc.vax/MAKEDEV.md index 68e74ca729b..2cc4d14f23d 100644 --- a/etc/etc.vax/MAKEDEV.md +++ b/etc/etc.vax/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,vax)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.35 2008/09/24 17:38:04 todd Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.36 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org> @@ -148,7 +148,7 @@ ramdisk) _recurse fd0 sd0 sd1 rd0 ;; -_std(2, 3, 50, 7, 33) +_std(2, 3, 50, 33) M ttyg0 c 25 0 600 M ttyg1 c 25 1 600 M ttyg2 c 25 2 600 diff --git a/etc/etc.zaurus/MAKEDEV.md b/etc/etc.zaurus/MAKEDEV.md index 61550070d72..bc0c282961f 100644 --- a/etc/etc.zaurus/MAKEDEV.md +++ b/etc/etc.zaurus/MAKEDEV.md @@ -1,6 +1,6 @@ define(MACHINE,zaurus)dnl vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.17 2008/06/28 21:46:05 mglocker Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.18 2009/01/25 17:30:48 miod Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -94,7 +94,7 @@ ramdisk) _recurse st0 ttyC0 wskbd0 apm bio ;; -_std(1, 2, 8, 3, 6) +_std(1, 2, 8, 6) ;; dnl dnl *** zaurus specific targets diff --git a/etc/mtree/special b/etc/mtree/special index eefa72f9be5..2514480c67f 100644 --- a/etc/mtree/special +++ b/etc/mtree/special @@ -1,4 +1,4 @@ -# $OpenBSD: special,v 1.79 2008/01/31 14:18:03 reyk Exp $ +# $OpenBSD: special,v 1.80 2009/01/25 17:30:48 miod Exp $ # $NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # @@ -8,7 +8,6 @@ . type=dir mode=0755 uname=root gname=wheel dev type=dir mode=0755 uname=root gname=wheel -drum type=char mode=0640 uname=root gname=kmem fd type=dir mode=0555 uname=root gname=wheel ignore .. #dev/fd kmem type=char mode=0640 uname=root gname=kmem diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 66e43776f25..8ee43499746 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.476 2009/01/25 03:20:23 ian Exp $ +# $OpenBSD: Makefile,v 1.477 2009/01/25 17:30:48 miod Exp $ MAN= aac.4 ac97.4 acphy.4 \ acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \ @@ -15,7 +15,7 @@ MAN= aac.4 ac97.4 acphy.4 \ cac.4 cas.4 cardbus.4 carp.4 ccd.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 dpt.4 \ - drm.4 drum.4 eap.4 ec.4 eephy.4 ef.4 eg.4 ehci.4 eisa.4 el.4 em.4 \ + drm.4 eap.4 ec.4 eephy.4 ef.4 eg.4 ehci.4 eisa.4 el.4 em.4 \ emu.4 enc.4 envy.4 ep.4 epic.4 esa.4 \ eso.4 ess.4 et.4 etphy.4 ex.4 exphy.4 \ faith.4 fd.4 fdc.4 fins.4 fintek.4 fms.4 fpa.4 fxp.4 gdt.4 \ diff --git a/share/man/man4/drum.4 b/share/man/man4/drum.4 deleted file mode 100644 index 7d0745d3587..00000000000 --- a/share/man/man4/drum.4 +++ /dev/null @@ -1,58 +0,0 @@ -.\" $OpenBSD: drum.4,v 1.5 2007/05/31 19:19:50 jmc Exp $ -.\" $NetBSD: drum.4,v 1.3 1994/11/30 16:22:11 jtc Exp $ -.\" -.\" Copyright (c) 1980, 1991, 1993 -.\" The Regents of the University of California. 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. -.\" 3. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. -.\" -.\" @(#)drum.4 8.1 (Berkeley) 6/5/93 -.\" -.Dd $Mdocdate: May 31 2007 $ -.Dt DRUM 4 -.Os -.Sh NAME -.Nm drum -.Nd paging device -.Sh DESCRIPTION -This file refers to the paging device in use by the system. -This may actually be a subdevice of one of the disk drivers, but in -a system with paging interleaved across multiple disk drives -it provides an indirect driver for the multiple drives. -.Sh FILES -.Bl -tag -width /dev/drum -.It Pa /dev/drum -.El -.Sh HISTORY -The -.Nm -special file appeared in -.Bx 3.0 . -.Sh BUGS -Reads from the drum are not allowed across the interleaving boundaries. -Since these only occur every .5Mbytes -or so, -and since the system never allocates blocks across the boundary, -this is usually not a problem. 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 $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -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 $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -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 $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -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 $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -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 $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -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 $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -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 $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -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 $ */ /*- * Copyright (c) 1995 Theo de Raadt @@ -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 $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -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 $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -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 $ */ /* * Copyright (c) 1992, 1993 @@ -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 $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -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 */ diff --git a/sys/sys/conf.h b/sys/sys/conf.h index cbdbdfb4738..2c282b0181b 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.92 2008/12/03 23:39:32 dlg Exp $ */ +/* $OpenBSD: conf.h,v 1.93 2009/01/25 17:30:49 miod Exp $ */ /* $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $ */ /*- @@ -264,13 +264,6 @@ extern struct cdevsw cdevsw[]; dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \ 0, (dev_type_poll((*))) enodev, (dev_type_mmap((*))) enodev } -/* read, write */ -#define cdev_swap_init(c,n) { \ - (dev_type_open((*))) nullop, (dev_type_close((*))) nullop, \ - dev_init(c,n,read), dev_init(c,n,write), (dev_type_ioctl((*))) enodev, \ - (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ - (dev_type_mmap((*))) enodev } - /* open, close, read, write, ioctl, tty, poll, kqfilter */ #define cdev_ptc_init(c,n) { \ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \ @@ -613,7 +606,6 @@ cdev_decl(video); cdev_decl(cn); bdev_decl(sw); -cdev_decl(sw); bdev_decl(vnd); cdev_decl(vnd); diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c index 026be0e856c..923cc81fe45 100644 --- a/sys/uvm/uvm_swap.c +++ b/sys/uvm/uvm_swap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_swap.c,v 1.84 2008/09/16 18:52:52 chl Exp $ */ +/* $OpenBSD: uvm_swap.c,v 1.85 2009/01/25 17:30:49 miod Exp $ */ /* $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $ */ /* @@ -213,10 +213,6 @@ struct pool vndbuf_pool; pool_put(&vndbuf_pool, (void *)(vbp)); \ } -/* /dev/drum */ -bdev_decl(sw); -cdev_decl(sw); - /* * local variables */ @@ -1177,40 +1173,6 @@ swap_off(p, sdp) */ /* - * swread: the read function for the drum (just a call to physio) - */ -/*ARGSUSED*/ -int -swread(dev, uio, ioflag) - dev_t dev; - struct uio *uio; - int ioflag; -{ - UVMHIST_FUNC("swread"); UVMHIST_CALLED(pdhist); - - UVMHIST_LOG(pdhist, " dev=%lx offset=%lx", - dev, (u_long)uio->uio_offset, 0, 0); - return (physio(swstrategy, NULL, dev, B_READ, minphys, uio)); -} - -/* - * swwrite: the write function for the drum (just a call to physio) - */ -/*ARGSUSED*/ -int -swwrite(dev, uio, ioflag) - dev_t dev; - struct uio *uio; - int ioflag; -{ - UVMHIST_FUNC("swwrite"); UVMHIST_CALLED(pdhist); - - UVMHIST_LOG(pdhist, " dev=%lx offset=%lx", - dev, (u_long)uio->uio_offset, 0, 0); - return (physio(swstrategy, NULL, dev, B_WRITE, minphys, uio)); -} - -/* * swstrategy: perform I/O on the drum * * => we must map the i/o request from the drum to the correct swapdev. |