Module Name: src
Committed By: hsuenaga
Date: Fri Apr 17 13:39:02 UTC 2015
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
don't call L2 maintance function if L2 cache is disabled.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/arm/arm/cpufunc.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/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.152 src/sys/arch/arm/arm/cpufunc.c:1.153
--- src/sys/arch/arm/arm/cpufunc.c:1.152 Wed Apr 15 10:52:18 2015
+++ src/sys/arch/arm/arm/cpufunc.c Fri Apr 17 13:39:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.152 2015/04/15 10:52:18 hsuenaga Exp $ */
+/* $NetBSD: cpufunc.c,v 1.153 2015/04/17 13:39:01 hsuenaga Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.152 2015/04/15 10:52:18 hsuenaga Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.153 2015/04/17 13:39:01 hsuenaga Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -1381,7 +1381,9 @@ struct cpu_functions pj4bv7_cpufuncs = {
.cf_dcache_inv_range = armv7_dcache_inv_range,
.cf_dcache_wb_range = armv7_dcache_wb_range,
-#if !defined(AURORA_IO_CACHE_COHERENCY) && defined(ARMADAXP)
+#if defined(L2CACHE_ENABLE) && \
+ !defined(AURORA_IO_CACHE_COHERENCY) && \
+ defined(ARMADAXP)
.cf_sdcache_wbinv_range = armadaxp_sdcache_wbinv_range,
.cf_sdcache_inv_range = armadaxp_sdcache_inv_range,
.cf_sdcache_wb_range = armadaxp_sdcache_wb_range,
