Module Name: src
Committed By: skrll
Date: Wed Sep 9 07:37:36 UTC 2015
Modified Files:
src/sys/arch/arm/include/arm32: pmap.h
Log Message:
Make L2_S_CACHE_MASK_armv6n consistent with other *_CACHE_MASK_armv6n
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/arm/include/arm32/pmap.h
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/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.141 src/sys/arch/arm/include/arm32/pmap.h:1.142
--- src/sys/arch/arm/include/arm32/pmap.h:1.141 Mon Jun 1 19:16:44 2015
+++ src/sys/arch/arm/include/arm32/pmap.h Wed Sep 9 07:37:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.141 2015/06/01 19:16:44 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.142 2015/09/09 07:37:36 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -794,12 +794,12 @@ extern void (*pmap_zero_page_func)(paddr
#define L2_S_CACHE_MASK_generic (L2_B|L2_C)
#define L2_S_CACHE_MASK_xscale (L2_B|L2_C|L2_XS_T_TEX(TEX_XSCALE_X))
#define L2_XS_CACHE_MASK_armv6 (L2_B|L2_C|L2_V6_XS_TEX(TEX_ARMV6_TEX))
-#define L2_S_CACHE_MASK_armv6n L2_XS_CACHE_MASK_armv6
#ifdef ARMV6_EXTENDED_SMALL_PAGE
#define L2_S_CACHE_MASK_armv6c L2_XS_CACHE_MASK_armv6
#else
#define L2_S_CACHE_MASK_armv6c L2_S_CACHE_MASK_generic
#endif
+#define L2_S_CACHE_MASK_armv6n (L2_B|L2_C|L2_V6_XS_TEX(TEX_ARMV6_TEX)|L2_XS_S)
#define L2_S_CACHE_MASK_armv7 (L2_B|L2_C|L2_V6_XS_TEX(TEX_ARMV6_TEX)|L2_XS_S)