Module Name: src
Committed By: martin
Date: Wed Sep 2 12:40:06 UTC 2020
Modified Files:
src/sys/arch/x86/x86 [netbsd-9]: pmap.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1073):
sys/arch/x86/x86/pmap.c: revision 1.404
Fix braino in pmap_find_gnt(), really return the gnt entry covering the range
and not one that starts just after.
Fixes a KASSERT in pmap_remove_gnt().
To generate a diff of this commit:
cvs rdiff -u -r1.334.2.3 -r1.334.2.4 src/sys/arch/x86/x86/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.334.2.3 src/sys/arch/x86/x86/pmap.c:1.334.2.4
--- src/sys/arch/x86/x86/pmap.c:1.334.2.3 Sun Jun 7 12:54:39 2020
+++ src/sys/arch/x86/x86/pmap.c Wed Sep 2 12:40:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.334.2.3 2020/06/07 12:54:39 martin Exp $ */
+/* $NetBSD: pmap.c,v 1.334.2.4 2020/09/02 12:40:06 martin Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334.2.3 2020/06/07 12:54:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334.2.4 2020/09/02 12:40:06 martin Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -4408,7 +4408,7 @@ pmap_find_gnt(struct pmap *pmap, vaddr_t
headp = pmap->pm_data;
KASSERT(headp != NULL);
SLIST_FOREACH(pgnt, headp, pd_gnt_list) {
- if (pgnt->pd_gnt_sva >= sva && pgnt->pd_gnt_sva <= eva)
+ if (pgnt->pd_gnt_sva <= sva && eva <= pgnt->pd_gnt_eva)
return pgnt;
/* check that we're not overlapping part of a region */
KASSERT(pgnt->pd_gnt_sva >= eva || pgnt->pd_gnt_eva <= sva);
