Module Name: src
Committed By: matt
Date: Tue Nov 12 17:31:55 UTC 2013
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
Make sure CPU_CONTROL_UNAL_ENABLE is enabled for armv7 cpus (should be
already but ...)
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 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.129 src/sys/arch/arm/arm/cpufunc.c:1.130
--- src/sys/arch/arm/arm/cpufunc.c:1.129 Tue Nov 12 17:14:39 2013
+++ src/sys/arch/arm/arm/cpufunc.c Tue Nov 12 17:31:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.129 2013/11/12 17:14:39 skrll Exp $ */
+/* $NetBSD: cpufunc.c,v 1.130 2013/11/12 17:31:55 matt 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.129 2013/11/12 17:14:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.130 2013/11/12 17:31:55 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -2996,7 +2996,9 @@ pj4bv7_setup(char *args)
pj4b_config();
cpuctrl = CPU_CONTROL_MMU_ENABLE;
-#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
+#ifdef ARM32_DISABLE_ALIGNMENT_FAULTS
+ cpuctrl |= CPU_CONTROL_UNAL_ENABLE;
+#else
cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
#endif
cpuctrl |= CPU_CONTROL_DC_ENABLE;
@@ -3047,16 +3049,14 @@ armv7_setup(char *args)
| CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
| CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK;
-#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
+#ifdef ARM32_DISABLE_ALIGNMENT_FAULTS
+ cpuctrl |= CPU_CONTROL_UNAL_ENABLE;
+#else
cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
#endif
cpuctrl = parse_cpu_options(args, armv7_options, cpuctrl);
-#ifdef __ARMEB__
- cpuctrl |= CPU_CONTROL_BEND_ENABLE;
-#endif
-
#ifndef ARM_HAS_VBAR
if (vector_page == ARM_VECTORS_HIGH)
cpuctrl |= CPU_CONTROL_VECRELOC;
