diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-27 17:48:26 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-27 17:48:26 +0000 |
commit | f0737604e8f2b59a8582e9bad166107658745296 (patch) | |
tree | d400c35c1e075fa5000c4235672a51408c85655c /sys/arch/amd64/include/pmap.h | |
parent | cf5638994f7716fc70d8cad17faf5f02c0c75e1d (diff) |
turning pmap_deactivate into a NOP brought back the reaper panics, probably
because the reaper is running on the mappings of pmap from the process it
is about to unmap. back it out until ht is fixed right; don't let this sit
in the tree waiting for a fix.
Diffstat (limited to 'sys/arch/amd64/include/pmap.h')
-rw-r--r-- | sys/arch/amd64/include/pmap.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/arch/amd64/include/pmap.h b/sys/arch/amd64/include/pmap.h index 94b4dfe0619..4ebdfa62e8f 100644 --- a/sys/arch/amd64/include/pmap.h +++ b/sys/arch/amd64/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.22 2009/04/23 07:42:02 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.23 2009/04/27 17:48:25 deraadt Exp $ */ /* $NetBSD: pmap.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $ */ /* @@ -325,6 +325,7 @@ struct pmap { union descriptor *pm_ldt; /* user-set LDT */ int pm_ldt_len; /* number of LDT entries */ int pm_ldt_sel; /* LDT selector */ + u_int32_t pm_cpus; /* mask of CPUs using pmap */ }; /* @@ -415,8 +416,6 @@ static void pmap_update_pg(vaddr_t); static void pmap_update_2pg(vaddr_t,vaddr_t); void pmap_write_protect(struct pmap *, vaddr_t, vaddr_t, vm_prot_t); -void pmap_switch(struct proc *, struct proc *); - vaddr_t reserve_dumppages(vaddr_t); /* XXX: not a pmap fn */ @@ -424,10 +423,8 @@ void pmap_tlb_shootpage(struct pmap *, vaddr_t); void pmap_tlb_shootrange(struct pmap *, vaddr_t, vaddr_t); void pmap_tlb_shoottlb(void); #ifdef MULTIPROCESSOR -void pmap_tlb_droppmap(struct pmap *); void pmap_tlb_shootwait(void); #else -#define pmap_tlb_droppmap(pm) #define pmap_tlb_shootwait() #endif |