summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-09-28 18:52:01 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-09-28 18:52:01 +0000
commit54fcd395e65bf54c23b1ce3ef533d68db1087f9b (patch)
tree9bec74691d691fd065457639cb8d11a5d806f313 /sys/arch
parent39ce713b4545d9257645cdfeb4cb775d4e207bad (diff)
malloc() without a WAIT flag
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc/sparc/intr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c
index 60341b662ec..7caa1889400 100644
--- a/sys/arch/sparc/sparc/intr.c
+++ b/sys/arch/sparc/sparc/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.35 2010/09/20 06:33:47 matthew Exp $ */
+/* $OpenBSD: intr.c,v 1.36 2010/09/28 18:52:00 deraadt Exp $ */
/* $NetBSD: intr.c,v 1.20 1997/07/29 09:42:03 fair Exp $ */
/*
@@ -485,7 +485,8 @@ softintr_establish(int level, void (*fn)(void *), void *arg)
}
#endif
- sih = (struct sintrhand *)malloc(sizeof *sih, M_DEVBUF, M_ZERO);
+ sih = (struct sintrhand *)malloc(sizeof *sih, M_DEVBUF,
+ M_NOWAIT|M_ZERO);
if (sih == NULL)
return NULL;