Module Name: src
Committed By: matt
Date: Sat Jun 22 00:44:17 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: arm32_kvminit.c
Log Message:
Fix inverted logic for mapping exception vector.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/arm32/arm32_kvminit.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/arm32/arm32_kvminit.c
diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.20 src/sys/arch/arm/arm32/arm32_kvminit.c:1.21
--- src/sys/arch/arm/arm32/arm32_kvminit.c:1.20 Wed Jun 12 21:34:12 2013
+++ src/sys/arch/arm/arm32/arm32_kvminit.c Sat Jun 22 00:44:17 2013
@@ -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 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
#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
