Module Name: src
Committed By: msaitoh
Date: Tue Oct 30 07:42:38 UTC 2012
Modified Files:
src/sys/arch/arm/pic: pic.c
Log Message:
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.14 -r1.15 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.14 src/sys/arch/arm/pic/pic.c:1.15
--- src/sys/arch/arm/pic/pic.c:1.14 Sat Sep 1 01:44:16 2012
+++ src/sys/arch/arm/pic/pic.c Tue Oct 30 07:42:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pic.c,v 1.14 2012/09/01 01:44:16 matt Exp $ */
+/* $NetBSD: pic.c,v 1.15 2012/10/30 07:42:35 msaitoh 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.14 2012/09/01 01:44:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.15 2012/10/30 07:42:35 msaitoh Exp $");
#define _INTR_PRIVATE
#include <sys/param.h>
@@ -684,7 +684,7 @@ pic_disestablish_source(struct intrsourc
KASSERT(is == pic->pic_sources[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;
/*
