remove vm_conf.h; art@ ok

14 files changed, 18 insertions, 72 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 77f1bd426db..466d6c660f7 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.29 2001/07/05 02:40:43 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.30 2001/08/06 22:34:43 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -46,7 +46,6 @@
 
 #include "wd.h"
 bdev_decl(wd);
-bdev_decl(sw);
 #include "st.h"
 #include "cd.h"
 #include "sd.h"
@@ -90,7 +89,6 @@ int	nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]);
 #define	mmread  mmrw
 #define	mmwrite mmrw
 cdev_decl(mm);
-cdev_decl(sw);
 #include "pty.h"
 #include "tun.h"
 dev_type_open(filedescopen);
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 8ea582cdbcb..86428d35233 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.25 2001/06/27 06:56:28 kjc Exp $	*/
+/*	$OpenBSD: conf.c,v 1.26 2001/08/06 22:34:43 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $	*/
 
 /*-
@@ -50,7 +50,6 @@ bdev_decl(ct);
 bdev_decl(mt);
 #include "hd.h"
 bdev_decl(hd);
-bdev_decl(sw);
 #include "sd.h"
 bdev_decl(sd);
 #include "ccd.h"
@@ -107,7 +106,6 @@ cdev_decl(ctty);
 #define	mmread	mmrw
 #define	mmwrite	mmrw
 cdev_decl(mm);
-cdev_decl(sw);
 #include "pty.h"
 #define	ptstty		ptytty
 #define	ptsioctl	ptyioctl
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 4d08cac86ba..931fe9939ac 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.12 2001/08/01 20:30:58 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.13 2001/08/06 22:34:43 mickey Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -44,7 +44,6 @@
 
 #include <machine/conf.h>
 
-bdev_decl(sw);
 #include "ccd.h"
 #include "vnd.h"
 #include "rd.h"
@@ -96,7 +95,6 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 #define mmread  mmrw
 #define mmwrite mmrw
 cdev_decl(mm);
-cdev_decl(sw);
 #include "pty.h"
 #include "wsdisplay.h"
 #include "wskbd.h"
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 6a0175611ca..cb09ad494b4 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.77 2001/07/05 02:35:34 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.78 2001/08/06 22:34:43 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -45,7 +45,6 @@
 
 #include "wd.h"
 bdev_decl(wd);
-bdev_decl(sw);
 #include "fdc.h"
 #include "fd.h"
 bdev_decl(fd);
@@ -149,7 +148,6 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 #define	mmwrite	mmrw
 cdev_decl(mm);
 cdev_decl(wd);
-cdev_decl(sw);
 cdev_decl(crypto);
 #include "pty.h"
 #include "com.h"
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index 860c9ebb049..c8c7f3622e1 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.24 2001/06/27 06:56:28 kjc Exp $	*/
+/*	$OpenBSD: conf.c,v 1.25 2001/08/06 22:34:44 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $	*/
 
 /*
@@ -49,7 +49,6 @@
 
 int	ttselect	__P((dev_t, int, struct proc *));
 
-bdev_decl(sw);
 #include "st.h"
 #include "sd.h"
 #include "cd.h"
@@ -90,7 +89,6 @@ cdev_decl(ite);
 #define mmread	mmrw
 #define mmwrite	mmrw
 cdev_decl(mm);
-cdev_decl(sw);
 #include "pty.h"
 #include "ss.h"
 cdev_decl(ss);
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index d897c4068fb..a161ad2d523 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.22 2001/06/27 06:56:29 kjc Exp $ */
+/*	$OpenBSD: conf.c,v 1.23 2001/08/06 22:34:44 mickey Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
@@ -74,7 +74,6 @@
 
 int	ttselect	__P((dev_t, int, struct proc *));
 
-bdev_decl(sw);
 #include "st.h"
 #include "sd.h"
 #include "cd.h"
@@ -115,7 +114,6 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 #define mmread  mmrw
 #define mmwrite mmrw
 cdev_decl(mm);
-cdev_decl(sw);
 
 #include "sram.h"
 cdev_decl(sram);
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index 55c0902ccc1..09bf36d548f 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.17 2001/06/27 06:56:29 kjc Exp $	*/
+/*	$OpenBSD: conf.c,v 1.18 2001/08/06 22:34:44 mickey Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -45,7 +45,6 @@
 
 int	ttselect	__P((dev_t, int, struct proc *));
 
-bdev_decl(sw);
 #include "st.h"
 bdev_decl(st);
 #include "sd.h"
@@ -105,7 +104,6 @@ cdev_decl(ctty);
 #define mmread  mmrw
 #define mmwrite mmrw
 cdev_decl(mm);
-cdev_decl(sw);
 
 #include "sram.h"
 cdev_decl(sram);
diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c
index 1752d46d270..ada859d2dd4 100644
--- a/sys/arch/mvmeppc/mvmeppc/conf.c
+++ b/sys/arch/mvmeppc/mvmeppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.6 2001/07/06 05:14:30 smurph Exp $ */
+/*	$OpenBSD: conf.c,v 1.7 2001/08/06 22:34:44 mickey Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -44,7 +44,6 @@
 bdev_decl(wd);
 #include "sd.h"
 bdev_decl(sd);
-bdev_decl(sw);
 #include "cd.h"
 bdev_decl(cd);
 
@@ -99,7 +98,6 @@ cdev_decl(pts);
 #define	ptcioctl	ptyioctl
 cdev_decl(ptc);
 cdev_decl(log);
-cdev_decl(sw);
 
 #include "bugtty.h"
 cdev_decl(bugtty);
diff --git a/sys/arch/powerpc/powerpc/conf.c b/sys/arch/powerpc/powerpc/conf.c
index 1cd87307d02..56a8aec2f2f 100644
--- a/sys/arch/powerpc/powerpc/conf.c
+++ b/sys/arch/powerpc/powerpc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.25 2001/07/09 04:41:28 mickey Exp $ */
+/*	$OpenBSD: conf.c,v 1.26 2001/08/06 22:34:44 mickey Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -44,7 +44,6 @@
 bdev_decl(wd);
 #include "sd.h"
 bdev_decl(sd);
-bdev_decl(sw);
 #include "cd.h"
 bdev_decl(cd);
 
@@ -98,7 +97,6 @@ cdev_decl(pts);
 #define	ptcioctl	ptyioctl
 cdev_decl(ptc);
 cdev_decl(log);
-cdev_decl(sw);
 #include "com.h"
 cdev_decl(com);
 
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index 7140cfb45d0..60d3f04d508 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.28 2001/06/27 06:56:30 kjc Exp $ */
+/*	$OpenBSD: conf.c,v 1.29 2001/08/06 22:34:44 mickey Exp $ */
 /*	$NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $	*/
 
 /*-
@@ -55,8 +55,6 @@ bdev_decl(ht);
 #include "rk.h"
 bdev_decl(rk);
 
-bdev_decl(sw);
-
 #include "te.h"
 bdev_decl(tm);
 
@@ -289,7 +287,6 @@ cdev_decl(ctty);
 #define mmread	mmrw
 #define mmwrite mmrw
 cdev_decl(mm);
-cdev_decl(sw);
 #include "pty.h"
 #define ptstty		ptytty
 #define ptsioctl	ptyioctl
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 07b51991026..f2272bacf12 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.46 2001/08/06 20:50:22 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.47 2001/08/06 22:34:44 mickey Exp $	*/
 /*	$NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $	*/
 
 /*-
@@ -493,6 +493,9 @@ cdev_decl(sequencer);
 
 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 a15ffa212ef..1b85acc0f9a 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_swap.c,v 1.32 2001/07/31 13:34:46 art Exp $	*/
+/*	$OpenBSD: uvm_swap.c,v 1.33 2001/08/06 22:34:44 mickey Exp $	*/
 /*	$NetBSD: uvm_swap.c,v 1.34 2000/02/07 20:16:59 thorpej Exp $	*/
 
 /*
@@ -48,9 +48,9 @@
 #include <sys/pool.h>
 #include <sys/syscallargs.h>
 #include <sys/swap.h>
+#include <sys/conf.h>
 
 #include <vm/vm.h>
-#include <vm/vm_conf.h>
 
 #include <uvm/uvm.h>
 #ifdef UVM_SWAP_ENCRYPT
diff --git a/sys/uvm/uvm_swap_encrypt.c b/sys/uvm/uvm_swap_encrypt.c
index 1b54ab583b1..7323a98b59f 100644
--- a/sys/uvm/uvm_swap_encrypt.c
+++ b/sys/uvm/uvm_swap_encrypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_swap_encrypt.c,v 1.7 2001/01/29 02:07:49 niklas Exp $	*/
+/*	$OpenBSD: uvm_swap_encrypt.c,v 1.8 2001/08/06 22:34:44 mickey Exp $	*/
 
 /*
  * Copyright 1999 Niels Provos <provos@citi.umich.edu>
@@ -36,11 +36,11 @@
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
+#include <sys/conf.h>
 #include <dev/rndvar.h>
 #include <crypto/rijndael.h>
 
 #include <vm/vm.h>
-#include <vm/vm_conf.h>
 
 #include <uvm/uvm.h>
 
diff --git a/sys/vm/vm_conf.h b/sys/vm/vm_conf.h
deleted file mode 100644
index 790d99bd880..00000000000
--- a/sys/vm/vm_conf.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*	$OpenBSD: vm_conf.h,v 1.1 1996/03/03 17:45:26 niklas Exp $	*/
-/*	$NetBSD: vm_conf.h,v 1.1 1996/02/05 01:53:53 christos Exp $	*/
-
-/*
- * Copyright (c) 1995 Christos Zoulas.  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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Christos Zoulas.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * 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.
- */
-
-#include <sys/conf.h>
-
-bdev_decl(sw);
-cdev_decl(sw);