[src/netbsd-7]: src/sys/arch/powerpc/booke Pull up following revision(s) (req...

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

details:   https://anonhg.NetBSD.org/src/rev/684f23961889
branches:  netbsd-7
changeset: 799012:684f23961889
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Feb 21 18:18:33 2015 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #535):
        sys/arch/powerpc/booke/e500_tlb.c: revision 1.17
fix compile failure without DIAGNOSTIC.

diffstat:

 sys/arch/powerpc/booke/e500_tlb.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 40b67ce3a824 -r 684f23961889 sys/arch/powerpc/booke/e500_tlb.c
--- a/sys/arch/powerpc/booke/e500_tlb.c Sat Feb 21 18:16:21 2015 +0000
+++ b/sys/arch/powerpc/booke/e500_tlb.c Sat Feb 21 18:18:33 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: e500_tlb.c,v 1.13 2013/12/09 09:35:16 wiz Exp $        */
+/*     $NetBSD: e500_tlb.c,v 1.13.4.1 2015/02/21 18:18:33 martin Exp $ */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.13 2013/12/09 09:35:16 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.13.4.1 2015/02/21 18:18:33 martin Exp $");
 
 #include <sys/param.h>
 
@@ -766,7 +766,7 @@
        KASSERT(((pte & PTE_RPN_MASK) & (len - 1)) == 0);
 
        if ((xtlb = e500_tlb_lookup_xtlb2(va, len)) != NULL) {
-               psize_t mask = ~(xtlb->e_tlb.tlb_size - 1);
+               psize_t mask __diagused = ~(xtlb->e_tlb.tlb_size - 1);
                KASSERT(len <= xtlb->e_tlb.tlb_size);
                KASSERT((pte & mask) == (xtlb->e_tlb.tlb_pte & mask));
                xtlb->e_refcnt++;