From e4524f556962f5f1f175ad42f45ce9612f78a84b Mon Sep 17 00:00:00 2001 From: guenther Date: Sun, 9 Sep 2018 22:41:57 +0000 Subject: [PATCH] Simplify pmap_is_curpmap(): %cr3 can never match pm_pdirpa_intel here as this code isn't present in those page tables ok mlarkin@ --- sys/arch/amd64/amd64/pmap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c index 3e473dc4915..85f23f08568 100644 --- a/sys/arch/amd64/amd64/pmap.c +++ b/sys/arch/amd64/amd64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.116 2018/07/12 14:11:11 guenther Exp $ */ +/* $OpenBSD: pmap.c,v 1.117 2018/09/09 22:41:57 guenther Exp $ */ /* $NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $ */ /* @@ -336,8 +336,7 @@ static __inline boolean_t pmap_is_curpmap(struct pmap *pmap) { return((pmap == pmap_kernel()) || - (pmap->pm_pdirpa == (paddr_t) rcr3()) || - (pmap->pm_pdirpa_intel == (paddr_t) rcr3())); + (pmap->pm_pdirpa == (paddr_t) rcr3())); } /* -- 2.20.1