[src/trunk]: src/sys/arch/arm/arm Drop inadvertent redundant CPU_CONTROL_MMU_...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5ce13056de91
branches:  trunk
changeset: 821197:5ce13056de91
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Jan 28 13:21:11 2017 +0000

description:
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.

diffstat:

 sys/arch/arm/arm/cpufunc.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 1d6611b84066 -r 5ce13056de91 sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Fri Jan 27 23:16:20 2017 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Sat Jan 28 13:21:11 2017 +0000
@@ -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 @@
        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