diff options
| author | Tom Cosgrove <tom@cvs.openbsd.org> | 2007-02-20 21:15:02 +0000 |
|---|---|---|
| committer | Tom Cosgrove <tom@cvs.openbsd.org> | 2007-02-20 21:15:02 +0000 |
| commit | b5de0662c0ae590547e7ddf1190bad604e2d2d32 (patch) | |
| tree | 24d8349b344e6d332fcbcfcb1db55cf1ca3417ee /sys/arch/i386/include/param.h | |
| parent | d084ccaa91178ec96027c48218e22002215bedba (diff) | |
Revert PAE pmap for now, until the strange bug is found. This stops
the freezes many of us are seeing (especially on amd64 machines running
OpenBSD/i386).
Much testing by nick@ (as always - thanks!), hugh@, ian@, kettenis@
and Sam Smith (s (at) msmith (dot) net).
Requested by, input from, and ok deraadt@ ok art@, kettenis@, miod@
Diffstat (limited to 'sys/arch/i386/include/param.h')
| -rw-r--r-- | sys/arch/i386/include/param.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h index cc288c2239b..161973c6f36 100644 --- a/sys/arch/i386/include/param.h +++ b/sys/arch/i386/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.38 2006/11/30 21:20:41 dim Exp $ */ +/* $OpenBSD: param.h,v 1.39 2007/02/20 21:15:01 tom Exp $ */ /* $NetBSD: param.h,v 1.29 1996/03/04 05:04:26 cgd Exp $ */ /*- @@ -75,6 +75,8 @@ #define PAGE_SIZE (1 << PAGE_SHIFT) #define PAGE_MASK (PAGE_SIZE - 1) +#define NPTEPG (NBPG/(sizeof (pt_entry_t))) + /* * Start of kernel virtual space. Remember to alter the memory and * page table layout description in pmap.h when changing this. @@ -129,3 +131,9 @@ /* bytes to disk blocks */ #define dbtob(x) ((x) << DEV_BSHIFT) #define btodb(x) ((x) >> DEV_BSHIFT) + +/* + * Mach derived conversion macros + */ +#define i386_round_pdr(x) ((((unsigned)(x)) + PDOFSET) & ~PDOFSET) +#define i386_trunc_pdr(x) ((unsigned)(x) & ~PDOFSET) |