[src/netbsd-7]: src/sys/arch/arm/arm Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/7a9a7b8868fe
branches:  netbsd-7
changeset: 799749:7a9a7b8868fe
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Jan 12 10:16:50 2016 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #1060):
        sys/arch/arm/arm/cpufunc.c: revision 1.159
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 620afba20a2f -r 7a9a7b8868fe sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Fri Jan 08 21:05:37 2016 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Tue Jan 12 10:16:50 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.150.2.1 2015/05/27 05:33:29 msaitoh Exp $        */
+/*     $NetBSD: cpufunc.c,v 1.150.2.2 2016/01/12 10:16:50 snj 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.150.2.1 2015/05/27 05:33:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.150.2.2 2016/01/12 10:16:50 snj Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_cpuoptions.h"
@@ -1920,7 +1920,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)