Module Name: src
Committed By: rmind
Date: Wed May 12 08:11:16 UTC 2010
Modified Files:
src/sys/kern: subr_pool.c
Log Message:
pool_{cache_}get: improve previous diagnostic by checking for panicstr,
so it wont trigger the assert while trying to dump core on crash.
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/sys/kern/subr_pool.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/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.184 src/sys/kern/subr_pool.c:1.185
--- src/sys/kern/subr_pool.c:1.184 Wed May 12 03:43:46 2010
+++ src/sys/kern/subr_pool.c Wed May 12 08:11:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.184 2010/05/12 03:43:46 rmind Exp $ */
+/* $NetBSD: subr_pool.c,v 1.185 2010/05/12 08:11:16 rmind Exp $ */
/*-
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.184 2010/05/12 03:43:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.185 2010/05/12 08:11:16 rmind Exp $");
#include "opt_ddb.h"
#include "opt_pool.h"
@@ -992,7 +992,8 @@
if (pp->pr_itemsperpage == 0)
panic("pool_get: pool '%s': pr_itemsperpage is zero, "
"pool not initialized?", pp->pr_wchan);
- if ((cpu_intr_p() || cpu_softintr_p()) && pp->pr_ipl == IPL_NONE)
+ if ((cpu_intr_p() || cpu_softintr_p()) && pp->pr_ipl == IPL_NONE &&
+ !cold && panicstr == NULL)
panic("pool '%s' is IPL_NONE, but called from "
"interrupt context\n", pp->pr_wchan);
#endif
@@ -2529,7 +2530,7 @@
int s;
KASSERTMSG((!cpu_intr_p() && !cpu_softintr_p()) ||
- (pc->pc_pool.pr_ipl != IPL_NONE || cold),
+ (pc->pc_pool.pr_ipl != IPL_NONE || cold || panicstr != NULL),
("pool '%s' is IPL_NONE, but called from interrupt context\n",
pc->pc_pool.pr_wchan));
