Commit the patch from
<http://mail-index.netbsd.org/current-users/2010/09/12/msg014289.html>, fixing a "panic: pool 'pfrktable' is IPL_NONE, but called from interrupt context" that occurred on NetBSD/sparc.
This commit is contained in:
parent
88f82fe716
commit
51a9336da1
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: pf_table.c,v 1.16 2010/04/12 13:57:38 ahoka Exp $ */
|
/* $NetBSD: pf_table.c,v 1.17 2011/05/11 12:22:34 hauke Exp $ */
|
||||||
/* $OpenBSD: pf_table.c,v 1.70 2007/05/23 11:53:45 markus Exp $ */
|
/* $OpenBSD: pf_table.c,v 1.70 2007/05/23 11:53:45 markus Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: pf_table.c,v 1.16 2010/04/12 13:57:38 ahoka Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: pf_table.c,v 1.17 2011/05/11 12:22:34 hauke Exp $");
|
||||||
|
|
||||||
#ifdef _KERNEL_OPT
|
#ifdef _KERNEL_OPT
|
||||||
#include "opt_inet.h"
|
#include "opt_inet.h"
|
||||||
|
@ -200,9 +200,9 @@ pfr_initialize(void)
|
||||||
{
|
{
|
||||||
#ifdef __NetBSD__
|
#ifdef __NetBSD__
|
||||||
pool_init(&pfr_ktable_pl, sizeof(struct pfr_ktable), 0, 0, 0,
|
pool_init(&pfr_ktable_pl, sizeof(struct pfr_ktable), 0, 0, 0,
|
||||||
"pfrktable", &pool_allocator_nointr, IPL_NONE);
|
"pfrktable", &pool_allocator_nointr, IPL_NET);
|
||||||
pool_init(&pfr_kentry_pl, sizeof(struct pfr_kentry), 0, 0, 0,
|
pool_init(&pfr_kentry_pl, sizeof(struct pfr_kentry), 0, 0, 0,
|
||||||
"pfrkentry", &pool_allocator_nointr, IPL_NONE);
|
"pfrkentry", &pool_allocator_nointr, IPL_NET);
|
||||||
pool_init(&pfr_kentry_pl2, sizeof(struct pfr_kentry), 0, 0, 0,
|
pool_init(&pfr_kentry_pl2, sizeof(struct pfr_kentry), 0, 0, 0,
|
||||||
"pfrkentry2", NULL, IPL_SOFTNET);
|
"pfrkentry2", NULL, IPL_SOFTNET);
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue