Module Name: src
Committed By: matt
Date: Thu Apr 10 02:45:02 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Fix pmap_extract to deal with non-4KB pages.
To generate a diff of this commit:
cvs rdiff -u -r1.281 -r1.282 src/sys/arch/arm/arm32/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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.281 src/sys/arch/arm/arm32/pmap.c:1.282
--- src/sys/arch/arm/arm32/pmap.c:1.281 Sat Apr 5 22:05:12 2014
+++ src/sys/arch/arm/arm32/pmap.c Thu Apr 10 02:45:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.281 2014/04/05 22:05:12 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.282 2014/04/10 02:45:02 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -216,7 +216,7 @@
#include <arm/locore.h>
//#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.281 2014/04/05 22:05:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.282 2014/04/10 02:45:02 matt Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -3901,7 +3901,7 @@ pmap_extract(pmap_t pm, vaddr_t va, padd
break;
default:
- pa = (pte & L2_S_FRAME) | (va & L2_S_OFFSET);
+ pa = (pte & ~PAGE_MASK) | (va & ~PAGE_MASK);
break;
}
}
