[src/trunk]: src/sys/arch/mips/include Need to compile in cache alias support...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1908b1e263b4
branches:  trunk
changeset: 347235:1908b1e263b4
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Aug 18 22:23:20 2016 +0000

description:
Need to compile in cache alias support when MIPS3 or MIPS4

diffstat:

 sys/arch/mips/include/cache.h |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 1c2e53557e7e -r 1908b1e263b4 sys/arch/mips/include/cache.h
--- a/sys/arch/mips/include/cache.h     Thu Aug 18 21:42:27 2016 +0000
+++ b/sys/arch/mips/include/cache.h     Thu Aug 18 22:23:20 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cache.h,v 1.13 2016/07/11 16:15:35 matt Exp $  */
+/*     $NetBSD: cache.h,v 1.14 2016/08/18 22:23:20 skrll Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -225,7 +225,9 @@
        bool mci_icache_virtual_alias;
 };
 
-#if (MIPS1 + MIPS64_RMIXL + MIPS64R2_RMIXL + MIPS64_OCTEON) > 0 \
+
+#if (MIPS1 + MIPS64_RMIXL + MIPS64R2_RMIXL + MIPS64_OCTEON) > 0 && \
+    (MIPS3 + MIPS4) == 0 \
      && !defined(MODULE)
 #define        MIPS_CACHE_ALIAS_MASK           0
 #define        MIPS_CACHE_VIRTUAL_ALIAS        false
@@ -233,7 +235,9 @@
 #define        MIPS_CACHE_ALIAS_MASK           mips_cache_info.mci_cache_alias_mask
 #define        MIPS_CACHE_VIRTUAL_ALIAS        mips_cache_info.mci_cache_virtual_alias
 #endif
-#if (MIPS1 + MIPS64_RMIXL + MIPS64_OCTEON) > 0 && !defined(_MODULE)
+#if (MIPS1 + MIPS64_RMIXL + MIPS64_OCTEON) > 0 && \
+    (MIPS3 + MIPS4) == 0 \
+    && !defined(_MODULE)
 #define        MIPS_ICACHE_ALIAS_MASK          0
 #define        MIPS_ICACHE_VIRTUAL_ALIAS       false
 #else