[src/trunk]: src/sys/arch/sparc/sparc || -> &&

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

details:   https://anonhg.NetBSD.org/src/rev/6ed60dc11171
branches:  trunk
changeset: 342192:6ed60dc11171
user:      macallan <macallan%NetBSD.org@localhost>
date:      Fri Dec 11 19:47:52 2015 +0000

description:
|| -> &&
>From PR50534

diffstat:

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

diffs (27 lines):

diff -r 2a29dd8a88d2 -r 6ed60dc11171 sys/arch/sparc/sparc/pmap.c
--- a/sys/arch/sparc/sparc/pmap.c       Fri Dec 11 12:41:10 2015 +0000
+++ b/sys/arch/sparc/sparc/pmap.c       Fri Dec 11 19:47:52 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.359 2015/10/04 08:18:49 joerg Exp $ */
+/*     $NetBSD: pmap.c,v 1.360 2015/12/11 19:47:52 macallan Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.359 2015/10/04 08:18:49 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.360 2015/12/11 19:47:52 macallan Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -4265,7 +4265,7 @@
                        continue;
                if (CPU_HAS_SUNMMU) {
                        int ctx;
-                       if (mmu_has_hole && (vr >= 32 || vr < (256 - 32)))
+                       if (mmu_has_hole && (vr >= 32 && vr < (256 - 32)))
                                continue;
                        ctx = getcontext4();
                        setcontext4(pm->pm_ctxnum);