Module Name: src
Committed By: riz
Date: Sat Oct 20 22:31:05 UTC 2012
Modified Files:
src/sys/arch/arm/marvell [netbsd-6]: kirkwood.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.10.1 src/sys/arch/arm/marvell/kirkwood.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/marvell/kirkwood.c
diff -u src/sys/arch/arm/marvell/kirkwood.c:1.4 src/sys/arch/arm/marvell/kirkwood.c:1.4.10.1
--- src/sys/arch/arm/marvell/kirkwood.c:1.4 Tue May 24 17:45:49 2011
+++ src/sys/arch/arm/marvell/kirkwood.c Sat Oct 20 22:31:05 2012
@@ -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 @@ kirkwood_find_pending_irqs(void)
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;
