Module Name: src
Committed By: skrll
Date: Mon Nov 10 14:33:00 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
In pmap_fault_fixup re-instate the TLB flush for the shared L1 case that
occurs for non-ARM_MMU_EXTENDED kernels.
This fixes rump/rumpkern/t_sp:stress_killer on rpi which is currently
non-ARM_MMU_EXTENDED
To generate a diff of this commit:
cvs rdiff -u -r1.312 -r1.313 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.312 src/sys/arch/arm/arm32/pmap.c:1.313
--- src/sys/arch/arm/arm32/pmap.c:1.312 Sat Nov 8 08:01:34 2014
+++ src/sys/arch/arm/arm32/pmap.c Mon Nov 10 14:33:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.312 2014/11/08 08:01:34 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.313 2014/11/10 14:33:00 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -215,7 +215,7 @@
#include <arm/locore.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.312 2014/11/08 08:01:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.313 2014/11/10 14:33:00 skrll Exp $");
//#define PMAP_DEBUG
#ifdef PMAP_DEBUG
@@ -4661,6 +4661,12 @@ pmap_fault_fixup(pmap_t pm, vaddr_t va,
#endif
#endif
+#ifndef ARM_MMU_EXTENDED
+ /* Flush the TLB in the shared L1 case - see comment above */
+ pmap_tlb_flush_SE(pm, va,
+ (ftype & VM_PROT_EXECUTE) ? PVF_EXEC | PVF_REF : PVF_REF);
+#endif
+
rv = 1;
out:
