CVS commit: src/sys/arch/arm

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Sat Jul 16 01:49:42 UTC 2016

Modified Files:
        src/sys/arch/arm/arm32: arm32_machdep.c
        src/sys/arch/arm/include: cpufunc.h

Log Message:
apply some #if (ARM_MMU_V6 + ARM_MMU_V7) != 0.
now this builds on pre v6-only.


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/arm/arm32/arm32_machdep.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/arm/include/cpufunc.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/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.111 src/sys/arch/arm/arm32/arm32_machdep.c:1.112
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.111	Fri Jul 15 05:59:46 2016
+++ src/sys/arch/arm/arm32/arm32_machdep.c	Sat Jul 16 01:49:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm32_machdep.c,v 1.111 2016/07/15 05:59:46 skrll Exp $	*/
+/*	$NetBSD: arm32_machdep.c,v 1.112 2016/07/16 01:49:42 mrg Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.111 2016/07/15 05:59:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.112 2016/07/16 01:49:42 mrg Exp $");
 
 #include "opt_modular.h"
 #include "opt_md.h"
@@ -750,7 +750,13 @@ mm_md_direct_mapped_phys(paddr_t pa, vad
 bool
 mm_md_page_color(paddr_t pa, int *colorp)
 {
+#if (ARM_MMU_V6 + ARM_MMU_V7) != 0
 	*colorp = atop(pa & arm_cache_prefer_mask);
 
 	return arm_cache_prefer_mask ? false : true;
+#else
+	*colorp = 0;
+
+	return true;
+#endif
 }

Index: src/sys/arch/arm/include/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.76 src/sys/arch/arm/include/cpufunc.h:1.77
--- src/sys/arch/arm/include/cpufunc.h:1.76	Sat Jan 23 21:39:18 2016
+++ src/sys/arch/arm/include/cpufunc.h	Sat Jul 16 01:49:42 2016
@@ -419,7 +419,9 @@ struct arm_cache_info {
 	uint8_t dcache_type;
 };
 
+#if (ARM_MMU_V6 + ARM_MMU_V7) != 0
 extern u_int arm_cache_prefer_mask;
+#endif
 extern u_int arm_dcache_align;
 extern u_int arm_dcache_align_mask;