diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2000-05-28 03:55:22 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2000-05-28 03:55:22 +0000 |
| commit | 06b735869ec6f1aade79eb2c8417fce1fa80fc50 (patch) | |
| tree | 8d3936911b8ac141b32e2ba2b93a46dd7ad57b39 /sys/arch/amiga/include | |
| parent | 106d5f711ecb1d0df06efcf8b035a40d97af9cd9 (diff) | |
Bugfix pmap_activate.
From NetBSD.
Diffstat (limited to 'sys/arch/amiga/include')
| -rw-r--r-- | sys/arch/amiga/include/pcb.h | 4 | ||||
| -rw-r--r-- | sys/arch/amiga/include/pmap.h | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/sys/arch/amiga/include/pcb.h b/sys/arch/amiga/include/pcb.h index 79988a800c5..efcd17f9ba4 100644 --- a/sys/arch/amiga/include/pcb.h +++ b/sys/arch/amiga/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.2 1997/01/16 09:25:59 niklas Exp $ */ +/* $OpenBSD: pcb.h,v 1.3 2000/05/28 03:55:21 art Exp $ */ /* $NetBSD: pcb.h,v 1.9 1995/05/11 23:05:57 chopps Exp $ */ /* @@ -54,7 +54,7 @@ struct pcb { short pcb_flags; /* misc. process flags (+0) */ short pcb_ps; /* processor status word (+2) */ - int pcb_ustp; /* user segment table pointer (+4) */ + int __pcb_spare0; int pcb_usp; /* user stack pointer (+8) */ int pcb_regs[12]; /* D2-D7, A2-A7 (+C) */ int pcb_cmap2; /* temporary copy PTE */ diff --git a/sys/arch/amiga/include/pmap.h b/sys/arch/amiga/include/pmap.h index 7ca76f2f778..f4eb15b8bb1 100644 --- a/sys/arch/amiga/include/pmap.h +++ b/sys/arch/amiga/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.5 2000/05/27 20:14:18 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.6 2000/05/28 03:55:21 art Exp $ */ /* $NetBSD: pmap.h,v 1.17 1997/06/10 18:34:52 veego Exp $ */ /* @@ -49,7 +49,6 @@ struct pmap { pt_entry_t *pm_ptab; /* KVA of page table */ st_entry_t *pm_stab; /* KVA of segment table */ - int pm_stchanged; /* ST changed */ int pm_stfree; /* 040: free lev2 blocks */ u_int *pm_stpa; /* 040: ST phys addr */ short pm_sref; /* segment table ref count */ @@ -80,12 +79,10 @@ typedef struct pmap *pmap_t; /* * Macros for speed */ -#define PMAP_ACTIVATE(pmap, pcb, loadhw) \ +#define PMAP_ACTIVATE(pmap, loadhw) \ { \ - (pcb)->pcb_ustp = m68k_btop((vm_offset_t)(pmap)->pm_stpa); \ if ((loadhw)) \ - loadustp((pcb)->pcb_ustp); \ - (pmap)->pm_stchanged = FALSE; \ + loadustp(m68k_btop((pmap)->pm_stpa)); \ } /* |