summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/include/pmap.h
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1997-07-06 08:02:14 +0000
committerJason Downs <downsj@cvs.openbsd.org>1997-07-06 08:02:14 +0000
commita3b5edea3991a5af513f92dd86991d7b1a561a54 (patch)
treef051a33605fa9c2bde1756be0816999893544828 /sys/arch/hp300/include/pmap.h
parenta66e6c132dfc5477c6359bf03ab2bd43b9779756 (diff)
Sync with changes from NetBSD, up to 970705.
This includes all of the new frodo drivers, from Michael Smith, hacked up by Jason R. Thorpe; other changes, mostly configuration and/or m68k abstraction related, from Thorpe. A few others of my own. This compiles and runs, have not yet tested Domain kbd or apci ports.
Diffstat (limited to 'sys/arch/hp300/include/pmap.h')
-rw-r--r--sys/arch/hp300/include/pmap.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/hp300/include/pmap.h b/sys/arch/hp300/include/pmap.h
index a90af0d3711..2c71617d631 100644
--- a/sys/arch/hp300/include/pmap.h
+++ b/sys/arch/hp300/include/pmap.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: pmap.h,v 1.4 1997/03/26 08:32:46 downsj Exp $ */
-/* $NetBSD: pmap.h,v 1.12 1997/03/18 16:39:30 mycroft Exp $ */
+/* $OpenBSD: pmap.h,v 1.5 1997/07/06 08:02:13 downsj Exp $ */
+/* $NetBSD: pmap.h,v 1.13 1997/06/10 18:58:19 veego Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@@ -95,7 +95,7 @@ typedef struct pmap *pmap_t;
*/
#define PMAP_ACTIVATE(pmapp, pcbp, iscurproc) \
if ((pmapp)->pm_stchanged) { \
- (pcbp)->pcb_ustp = hp300_btop((vm_offset_t)(pmapp)->pm_stpa); \
+ (pcbp)->pcb_ustp = m68k_btop((vm_offset_t)(pmapp)->pm_stpa); \
if (iscurproc) \
loadustp((pcbp)->pcb_ustp); \
(pmapp)->pm_stchanged = FALSE; \