Module Name: src
Committed By: jakllsch
Date: Sat Jan 28 13:21:11 UTC 2017
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
Drop inadvertent redundant CPU_CONTROL_MMU_ENABLE ((1 < 22)) for PJ4Bv7.
This was intended to be CPU_CONTROL_UNAL_ENABLE, which is already handled.
Should fix PR kern/51921.
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 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.162 src/sys/arch/arm/arm/cpufunc.c:1.163
--- src/sys/arch/arm/arm/cpufunc.c:1.162 Tue Oct 18 13:58:52 2016
+++ src/sys/arch/arm/arm/cpufunc.c Sat Jan 28 13:21:11 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.162 2016/10/18 13:58:52 kiyohara Exp $ */
+/* $NetBSD: cpufunc.c,v 1.163 2017/01/28 13:21:11 jakllsch 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.162 2016/10/18 13:58:52 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.163 2017/01/28 13:21:11 jakllsch Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -3076,7 +3076,7 @@ pj4bv7_setup(char *args)
cpuctrl |= CPU_CONTROL_IC_ENABLE;
cpuctrl |= (0xf << 3);
cpuctrl |= CPU_CONTROL_BPRD_ENABLE;
- cpuctrl |= (0x5 << 16) | (1 < 22);
+ cpuctrl |= (0x5 << 16);
cpuctrl |= CPU_CONTROL_XP_ENABLE;
#ifndef ARM_HAS_VBAR
