Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc/marvell Appease -Wshadow.



details:   https://anonhg.NetBSD.org/src/rev/d47ecb8b2fe5
branches:  trunk
changeset: 581615:d47ecb8b2fe5
user:      scw <scw%NetBSD.org@localhost>
date:      Fri Jun 03 11:20:06 2005 +0000

description:
Appease -Wshadow.

diffstat:

 sys/arch/powerpc/marvell/extintr.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 18cabfee3178 -r d47ecb8b2fe5 sys/arch/powerpc/marvell/extintr.c
--- a/sys/arch/powerpc/marvell/extintr.c        Fri Jun 03 11:17:42 2005 +0000
+++ b/sys/arch/powerpc/marvell/extintr.c        Fri Jun 03 11:20:06 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: extintr.c,v 1.12 2004/06/01 00:49:41 matt Exp $        */
+/*     $NetBSD: extintr.c,v 1.13 2005/06/03 11:20:06 scw Exp $ */
 
 /*
  * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: extintr.c,v 1.12 2004/06/01 00:49:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: extintr.c,v 1.13 2005/06/03 11:20:06 scw Exp $");
 
 #include "opt_marvell.h"
 #include "opt_kgdb.h"
@@ -499,13 +499,11 @@
         * if the IRQ is shared, level cannot vary
         */
        for (irq = 0, is = intr_sources; irq < NIRQ; irq++, is++) {
-               const int level = is->is_level;
-
                for (q = is->is_hand; q; q = q->ih_next)
-                       if (q->ih_level != level)
+                       if (q->ih_level != is->is_level)
                                panic("intr_calculatemasks: irq %d "
                                        "conflicting levels %d, %d\n",
-                                               irq, q->ih_level, level);
+                                               irq, q->ih_level, is->is_level);
        }
 
        /*



Home | Main Index | Thread Index | Old Index