[src/trunk]: src/sys/arch/arm/arm PR port-arm/50512: Source code condition im...

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

details:   https://anonhg.NetBSD.org/src/rev/91df386fff1d
branches:  trunk
changeset: 342173:91df386fff1d
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Dec 10 22:04:54 2015 +0000

description:
PR port-arm/50512: Source code condition impossible

Fix condition which broke ARM1136 function selection when ARM1176 support
was added

diffstat:

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

diffs (27 lines):

diff -r d97732c6ea3d -r 91df386fff1d sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Thu Dec 10 21:56:04 2015 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Thu Dec 10 22:04:54 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.158 2015/11/25 08:39:45 skrll Exp $      */
+/*     $NetBSD: cpufunc.c,v 1.159 2015/12/10 22:04:54 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.158 2015/11/25 08:39:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.159 2015/12/10 22:04:54 skrll Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_cpuoptions.h"
@@ -1927,7 +1927,7 @@
            cputype == CPU_ID_ARM1176JZS) {
                cpufuncs = arm11_cpufuncs;
 #if defined(CPU_ARM1136)
-               if (cputype == CPU_ID_ARM1136JS &&
+               if (cputype == CPU_ID_ARM1136JS ||
                    cputype == CPU_ID_ARM1136JSR1) {
                        cpufuncs = arm1136_cpufuncs;
                        if (cputype == CPU_ID_ARM1136JS)