[src/netbsd-6]: src/sys/arch/arm/marvell Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/80ba3bae7164
branches:  netbsd-6
changeset: 775372:80ba3bae7164
user:      riz <riz%NetBSD.org@localhost>
date:      Sat Oct 20 22:31:05 2012 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #609):
        sys/arch/arm/marvell/kirkwood.c: revision 1.5
Fix always check high.  macro KIRKWOOD_IRQ_* means bit number.  HIGH is
bit0.

diffstat:

 sys/arch/arm/marvell/kirkwood.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 587163816230 -r 80ba3bae7164 sys/arch/arm/marvell/kirkwood.c
--- a/sys/arch/arm/marvell/kirkwood.c   Sat Oct 20 22:18:29 2012 +0000
+++ b/sys/arch/arm/marvell/kirkwood.c   Sat Oct 20 22:31:05 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kirkwood.c,v 1.4 2011/05/24 17:45:49 matt Exp $        */
+/*     $NetBSD: kirkwood.c,v 1.4.10.1 2012/10/20 22:31:05 riz Exp $    */
 /*
  * Copyright (c) 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kirkwood.c,v 1.4 2011/05/24 17:45:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kirkwood.c,v 1.4.10.1 2012/10/20 22:31:05 riz Exp $");
 
 #define _INTR_PRIVATE
 
@@ -188,7 +188,7 @@
        if (pendinglow != 0)
                ipl |= pic_mark_pending_sources(&kirkwood_pic, 0, pendinglow);
 
-       if ((causelow & KIRKWOOD_IRQ_HIGH) == KIRKWOOD_IRQ_HIGH) {
+       if ((causelow & (1 << KIRKWOOD_IRQ_HIGH)) == (1 << KIRKWOOD_IRQ_HIGH)) {
                uint32_t causehigh = read_mlmbreg(KIRKWOOD_MLMB_MICHR);
                uint32_t pendinghigh = read_mlmbreg(KIRKWOOD_MLMB_MIRQIMHR);
                pendinghigh &= causehigh;