Module Name: src
Committed By: riz
Date: Mon Nov 19 18:45:04 UTC 2012
Modified Files:
src/sys/arch/arm/pic [netbsd-6]: pic.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #656):
sys/arch/arm/pic/pic.c: revision 1.15
Fix a bug that incorrect arg is passed to pic_block_irqs() on disestablish.
Fixes PR#45371 by Yuichiro Goto.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.10.1 src/sys/arch/arm/pic/pic.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/pic/pic.c
diff -u src/sys/arch/arm/pic/pic.c:1.8 src/sys/arch/arm/pic/pic.c:1.8.10.1
--- src/sys/arch/arm/pic/pic.c:1.8 Fri Mar 11 03:16:14 2011
+++ src/sys/arch/arm/pic/pic.c Mon Nov 19 18:45:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic.c,v 1.8 2011/03/11 03:16:14 bsh Exp $ */
+/* $NetBSD: pic.c,v 1.8.10.1 2012/11/19 18:45:04 riz Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.8 2011/03/11 03:16:14 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.8.10.1 2012/11/19 18:45:04 riz Exp $");
#define _INTR_PRIVATE
#include <sys/param.h>
@@ -520,7 +520,7 @@ pic_disestablish_source(struct intrsourc
struct pic_softc * const pic = is->is_pic;
const int irq = is->is_irq;
- (*pic->pic_ops->pic_block_irqs)(pic, irq & ~31, __BIT(irq));
+ (*pic->pic_ops->pic_block_irqs)(pic, irq & ~0x1f, __BIT(irq & 0x1f));
pic->pic_sources[irq] = NULL;
pic__iplsources[pic_ipl_offset[is->is_ipl] + is->is_iplidx] = NULL;
evcnt_detach(&is->is_ev);
