diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2001-04-07 17:17:29 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2001-04-07 17:17:29 +0000 |
| commit | 8fb021cc46189a2d4349ea0e1257e378ed002033 (patch) | |
| tree | 6c39ef7d2f160fd49c2abd91308a5e5028f291f0 | |
| parent | bcde4a8cad2cba0e1dd422e4796aed2ddc84d02f (diff) | |
OK, PMAP_NEW by default once again. This time it should work better for
userland since art removed the vm_pmap field that made UVM and old VM
differ. An option PMAP_OLD is provided should someone need to configure
with the old pmap. This is suspected to go away soon so I will not
document it.
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 6 | ||||
| -rw-r--r-- | sys/arch/i386/include/param.h | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 5dba53ad904..47e9204fac3 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.80 2001/04/03 01:32:23 deraadt Exp $ +# $OpenBSD: files.i386,v 1.81 2001/04/07 17:17:27 niklas Exp $ # $NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $ # # new style config file for i386 architecture @@ -30,8 +30,8 @@ file arch/i386/i386/i686_mem.c mtrr file arch/i386/i386/k6_mem.c mtrr file arch/i386/i386/microtime.s file arch/i386/i386/ns_cksum.c ns -file arch/i386/i386/pmap.c pmap_new -file arch/i386/i386/pmap.old.c !pmap_new +file arch/i386/i386/pmap.c !pmap_old & uvm +file arch/i386/i386/pmap.old.c pmap_old | !uvm file arch/i386/i386/process_machdep.c file arch/i386/i386/random.s file arch/i386/i386/sys_machdep.c diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h index 95c4224f939..e118bd08d1a 100644 --- a/sys/arch/i386/include/param.h +++ b/sys/arch/i386/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.13 2001/04/03 01:32:24 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.14 2001/04/07 17:17:28 niklas Exp $ */ /* $NetBSD: param.h,v 1.29 1996/03/04 05:04:26 cgd Exp $ */ /*- @@ -99,6 +99,14 @@ #define MSGBUFSIZE 2*NBPG /* default message buffer size */ #endif +#if !defined(UVM) && defined(PMAP_NEW) +#error PMAP_NEW is not compatible with old VM +#elif defined(UVM) && !defined(PMAP_NEW) && !defined(PMAP_OLD) +#define PMAP_NEW +#elif defined(PMAP_NEW) && defined(PMAP_OLD) +#error Both PMAP_NEW and PMAP_OLD cannot be defined concurrently +#endif + /* * Constants related to network buffer management. * MCLBYTES must be no larger than CLBYTES (the software page size), and, |