Module Name: src
Committed By: snj
Date: Wed Jul 13 08:20:45 UTC 2016
Modified Files:
src/sys/arch/arm/arm [netbsd-6]: cpufunc.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1354):
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
To generate a diff of this commit:
cvs rdiff -u -r1.104.2.2 -r1.104.2.3 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.104.2.2 src/sys/arch/arm/arm/cpufunc.c:1.104.2.3
--- src/sys/arch/arm/arm/cpufunc.c:1.104.2.2 Mon Jan 7 16:42:51 2013
+++ src/sys/arch/arm/arm/cpufunc.c Wed Jul 13 08:20:45 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.104.2.2 2013/01/07 16:42:51 riz Exp $ */
+/* $NetBSD: cpufunc.c,v 1.104.2.3 2016/07/13 08:20:45 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.104.2.2 2013/01/07 16:42:51 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.104.2.3 2016/07/13 08:20:45 snj Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -1708,7 +1708,7 @@ set_cpufuncs(void)
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)
