Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/arm32 Fix inverted logic for mapping exception ...



details:   https://anonhg.NetBSD.org/src/rev/542337856692
branches:  trunk
changeset: 787523:542337856692
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jun 22 00:44:17 2013 +0000

description:
Fix inverted logic for mapping exception vector.

diffstat:

 sys/arch/arm/arm32/arm32_kvminit.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r afe156b3812f -r 542337856692 sys/arch/arm/arm32/arm32_kvminit.c
--- a/sys/arch/arm/arm32/arm32_kvminit.c        Sat Jun 22 00:35:31 2013 +0000
+++ b/sys/arch/arm/arm32/arm32_kvminit.c        Sat Jun 22 00:44:17 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm32_kvminit.c,v 1.20 2013/06/12 21:34:12 matt Exp $  */
+/*     $NetBSD: arm32_kvminit.c,v 1.21 2013/06/22 00:44:17 matt Exp $  */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -122,7 +122,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.20 2013/06/12 21:34:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.21 2013/06/22 00:44:17 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -375,8 +375,8 @@
 #ifdef ARM_HAS_VBAR
        const bool map_vectors_p = false;
 #elif defined(CPU_ARMV7) || defined(CPU_ARM11)
-       const bool map_vectors_p = vectors == ARM_VECTORS_LOW
-           && !(armreg_pfr1_read() & ARM_PFR1_SEC_MASK);
+       const bool map_vectors_p = vectors == ARM_VECTORS_HIGH
+           || (armreg_pfr1_read() & ARM_PFR1_SEC_MASK) == 0;
 #else
        const bool map_vectors_p = true;
 #endif



Home | Main Index | Thread Index | Old Index