Module Name: src
Committed By: snj
Date: Tue May 19 04:58:31 UTC 2015
Modified Files:
src/sys/arch/arm/arm32 [netbsd-7]: pmap.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #777):
sys/arch/arm/arm32/pmap.c: revision 1.308
pmap_tlb_flushD is for !ARM_MMU_EXTENDED only now
To generate a diff of this commit:
cvs rdiff -u -r1.295.2.4 -r1.295.2.5 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.295.2.4 src/sys/arch/arm/arm32/pmap.c:1.295.2.5
--- src/sys/arch/arm/arm32/pmap.c:1.295.2.4 Fri Apr 10 20:17:52 2015
+++ src/sys/arch/arm/arm32/pmap.c Tue May 19 04:58:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.295.2.4 2015/04/10 20:17:52 snj Exp $ */
+/* $NetBSD: pmap.c,v 1.295.2.5 2015/05/19 04:58:31 snj 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.295.2.4 2015/04/10 20:17:52 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.295.2.5 2015/05/19 04:58:31 snj Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -850,12 +850,10 @@ pmap_tlb_flushID(pmap_t pm)
#endif /* ARM_MMU_EXTENDED */
}
+#ifndef ARM_MMU_EXTENDED
static inline void
pmap_tlb_flushD(pmap_t pm)
{
-#ifdef ARM_MMU_EXTENDED
- pmap_tlb_asid_release_all(pm);
-#else
if (pm->pm_cstate.cs_tlb_d) {
cpu_tlb_flushD();
#if ARM_MMU_V7 == 0
@@ -869,8 +867,8 @@ pmap_tlb_flushD(pmap_t pm)
pm->pm_cstate.cs_tlb_d = 0;
#endif /* ARM_MMU_V7 */
}
-#endif /* ARM_MMU_EXTENDED */
}
+#endif /* ARM_MMU_EXTENDED */
#ifdef PMAP_CACHE_VIVT
static inline void
