diff options
| author | Charles Longeau <chl@cvs.openbsd.org> | 2008-10-09 18:35:39 +0000 |
|---|---|---|
| committer | Charles Longeau <chl@cvs.openbsd.org> | 2008-10-09 18:35:39 +0000 |
| commit | a380e96290d8cc7f60fb2d23afd14098e1908852 (patch) | |
| tree | eb6bd8e94988937da8cd3a2f1018f87d1d7a2b55 /sys/arch | |
| parent | 9c142614c7446d06aca7a0be74498e8816b00e7c (diff) | |
replace M_WAITOK with M_NOWAIT
ok krw@ kettenis@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/amd64/intr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/intr.c b/sys/arch/amd64/amd64/intr.c index aa5de4eecbe..6756c90b6fe 100644 --- a/sys/arch/amd64/amd64/intr.c +++ b/sys/arch/amd64/amd64/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.17 2008/04/28 18:09:00 kettenis Exp $ */ +/* $OpenBSD: intr.c,v 1.18 2008/10/09 18:35:38 chl Exp $ */ /* $NetBSD: intr.c,v 1.3 2003/03/03 22:16:20 fvdl Exp $ */ /* @@ -565,7 +565,7 @@ cpu_intr_init(struct cpu_info *ci) int i; #endif - isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_WAITOK|M_ZERO); + isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_NOWAIT|M_ZERO); if (isp == NULL) panic("can't allocate fixed interrupt source"); isp->is_recurse = Xsoftclock; @@ -574,7 +574,7 @@ cpu_intr_init(struct cpu_info *ci) isp->is_handlers = &fake_softclock_intrhand; isp->is_pic = &softintr_pic; ci->ci_isources[SIR_CLOCK] = isp; - isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_WAITOK|M_ZERO); + isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_NOWAIT|M_ZERO); if (isp == NULL) panic("can't allocate fixed interrupt source"); isp->is_recurse = Xsoftnet; @@ -583,7 +583,7 @@ cpu_intr_init(struct cpu_info *ci) isp->is_handlers = &fake_softnet_intrhand; isp->is_pic = &softintr_pic; ci->ci_isources[SIR_NET] = isp; - isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_WAITOK|M_ZERO); + isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_NOWAIT|M_ZERO); if (isp == NULL) panic("can't allocate fixed interrupt source"); isp->is_recurse = Xsofttty; @@ -593,7 +593,7 @@ cpu_intr_init(struct cpu_info *ci) isp->is_pic = &softintr_pic; ci->ci_isources[SIR_TTY] = isp; #if NLAPIC > 0 - isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_WAITOK|M_ZERO); + isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_NOWAIT|M_ZERO); if (isp == NULL) panic("can't allocate fixed interrupt source"); isp->is_recurse = Xrecurse_lapic_ltimer; @@ -603,7 +603,7 @@ cpu_intr_init(struct cpu_info *ci) isp->is_pic = &local_pic; ci->ci_isources[LIR_TIMER] = isp; #ifdef MULTIPROCESSOR - isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_WAITOK|M_ZERO); + isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_NOWAIT|M_ZERO); if (isp == NULL) panic("can't allocate fixed interrupt source"); isp->is_recurse = Xrecurse_lapic_ipi; |