diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2007-12-11 01:00:45 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2007-12-11 01:00:45 +0000 |
| commit | 5bd9c210efad0c6d45e107a049c19d073ab8d883 (patch) | |
| tree | fabcd876e4c22bb025d87e9b95cff97e1e844687 /sys | |
| parent | f40133bd10759c487bca8966e236bb7b24572542 (diff) | |
Use malloc/free instead of kmem_alloc/kmem_free in pmf_event_inject, since
the latter is not safe to use from a softint. Pointed out by rmind.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_pmf.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/kern/kern_pmf.c b/sys/kern/kern_pmf.c index 6d46c94ab09..b2d06406f95 100644 --- a/sys/kern/kern_pmf.c +++ b/sys/kern/kern_pmf.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_pmf.c,v 1.3 2007/12/10 23:50:25 xtraeme Exp $ */ +/* $NetBSD: kern_pmf.c,v 1.4 2007/12/11 01:00:45 jmcneill Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca> @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.3 2007/12/10 23:50:25 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.4 2007/12/11 01:00:45 jmcneill Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.3 2007/12/10 23:50:25 xtraeme Exp $") #include <sys/device.h> #include <sys/pmf.h> #include <sys/queue.h> -#include <sys/kmem.h> #include <sys/syscallargs.h> /* for sys_sync */ #include <sys/workqueue.h> #include <prop/proplib.h> @@ -106,7 +105,9 @@ pmf_event_worker(struct work *wk, void *dummy) (*event->pmf_handler)(event->pmf_device); } - kmem_free(pew, sizeof(pmf_event_workitem_t)); + free(pew, M_TEMP); + + return; } static bool @@ -450,7 +451,7 @@ pmf_event_inject(device_t dv, pmf_generic_event_t ev) { pmf_event_workitem_t *pew; - pew = kmem_alloc(sizeof(pmf_event_workitem_t), KM_NOSLEEP); + pew = malloc(sizeof(pmf_event_workitem_t), M_TEMP, M_NOWAIT); if (pew == NULL) { PMF_EVENT_PRINTF(("%s: PMF event %d dropped (no memory)\n", dv ? device_xname(dv) : "<anonymous>", ev)); |
