diff options
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 6 | ||||
| -rw-r--r-- | sys/arch/i386/include/param.h | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 836403bf5e5..a4859ad4e5a 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.78 2001/03/22 23:36:51 niklas Exp $ +# $OpenBSD: files.i386,v 1.79 2001/04/02 23:24:11 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 +file arch/i386/i386/pmap.old.c pmap_old 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 6d32250764f..0b49043cd14 100644 --- a/sys/arch/i386/include/param.h +++ b/sys/arch/i386/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.11 2000/04/07 21:05:05 mjacob Exp $ */ +/* $OpenBSD: param.h,v 1.12 2001/04/02 23:24:12 niklas Exp $ */ /* $NetBSD: param.h,v 1.29 1996/03/04 05:04:26 cgd Exp $ */ /*- @@ -99,6 +99,12 @@ #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, |