diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-04-03 01:32:25 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-04-03 01:32:25 +0000 |
| commit | e0de522f9f7fea20eb71e8cbce70f698aac97fa3 (patch) | |
| tree | ee231a47faae3cf251b4a423351067adf25beccd /sys/arch | |
| parent | fbb526ac060a144411bc484e2583951b43605535 (diff) | |
If you cannot test your work, please do not do commits and then break userland
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 6 | ||||
| -rw-r--r-- | sys/arch/i386/include/param.h | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index a4859ad4e5a..5dba53ad904 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.79 2001/04/02 23:24:11 niklas Exp $ +# $OpenBSD: files.i386,v 1.80 2001/04/03 01:32:23 deraadt 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_old -file arch/i386/i386/pmap.old.c pmap_old +file arch/i386/i386/pmap.c pmap_new +file arch/i386/i386/pmap.old.c !pmap_new 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 0b49043cd14..95c4224f939 100644 --- a/sys/arch/i386/include/param.h +++ b/sys/arch/i386/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.12 2001/04/02 23:24:12 niklas Exp $ */ +/* $OpenBSD: param.h,v 1.13 2001/04/03 01:32:24 deraadt Exp $ */ /* $NetBSD: param.h,v 1.29 1996/03/04 05:04:26 cgd Exp $ */ /*- @@ -99,12 +99,6 @@ #define MSGBUFSIZE 2*NBPG /* default message buffer size */ #endif -#if !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, |