Module Name: src
Committed By: matt
Date: Mon Oct 29 05:25:20 UTC 2012
Modified Files:
src/sys/arch/powerpc/booke: e500_intr.c
Log Message:
Change a KASSERT to a KASSERTMSG.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/booke/e500_intr.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/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.21 src/sys/arch/powerpc/booke/e500_intr.c:1.22
--- src/sys/arch/powerpc/booke/e500_intr.c:1.21 Wed Aug 1 21:30:22 2012
+++ src/sys/arch/powerpc/booke/e500_intr.c Mon Oct 29 05:25:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.21 2012/08/01 21:30:22 matt Exp $ */
+/* $NetBSD: e500_intr.c,v 1.22 2012/10/29 05:25:19 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -39,7 +39,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.21 2012/08/01 21:30:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.22 2012/10/29 05:25:19 matt Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -913,7 +913,9 @@ e500_extintr(struct trapframe *tf)
* Timer interrupts get their argument overriden with
* the pointer to the trapframe.
*/
- KASSERT(is->is_ipl == ipl);
+ KASSERTMSG(is->is_ipl == ipl,
+ "iack %#x: is %p: irq %d ipl %d != iack ipl %d",
+ iack, is, irq, is->is_ipl, ipl);
void *arg = (is->is_ist == IST_TIMER ? tf : is->is_arg);
if (is->is_ipl <= old_ipl)
panic("%s(%p): %s (%u): is->is_ipl (%u) <= old_ipl (%u)\n",
