Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/arm Be consistent about #ifndef ARM32_DISABLE_A...
details: https://anonhg.NetBSD.org/src/rev/ab777c6c2aa7
branches: trunk
changeset: 380032:ab777c6c2aa7
user: skrll <skrll%NetBSD.org@localhost>
date: Fri Jul 02 07:15:35 2021 +0000
description:
Be consistent about #ifndef ARM32_DISABLE_ALIGNMENT_FAULTS. NFCI.
diffstat:
sys/arch/arm/arm/cpufunc.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (32 lines):
diff -r e6683dfbc29a -r ab777c6c2aa7 sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c Fri Jul 02 04:38:10 2021 +0000
+++ b/sys/arch/arm/arm/cpufunc.c Fri Jul 02 07:15:35 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.180 2021/01/31 05:59:55 skrll Exp $ */
+/* $NetBSD: cpufunc.c,v 1.181 2021/07/02 07:15:35 skrll 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.180 2021/01/31 05:59:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.181 2021/07/02 07:15:35 skrll Exp $");
#include "opt_arm_start.h"
#include "opt_compat_netbsd.h"
@@ -2868,10 +2868,10 @@ pj4bv7_setup(char *args)
pj4b_config();
cpuctrl = CPU_CONTROL_MMU_ENABLE;
-#ifdef ARM32_DISABLE_ALIGNMENT_FAULTS
+#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
+ cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
+#else
cpuctrl |= CPU_CONTROL_UNAL_ENABLE;
-#else
- cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
#endif
cpuctrl |= CPU_CONTROL_DC_ENABLE;
cpuctrl |= CPU_CONTROL_IC_ENABLE;
Home |
Main Index |
Thread Index |
Old Index