From 311e51b48afbae217c2d73540c11e7f9bb310db9 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 4 Mar 2005 00:01:30 +0000 Subject: [PATCH] Also, do not use M_NOWAIT for an allocation that must succeed. --- sys/kern/link_elf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index ca42a8bfce..20d52da0c5 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/link_elf.c,v 1.24 1999/12/24 15:33:36 bde Exp $ - * $DragonFly: src/sys/kern/link_elf.c,v 1.16 2005/03/03 19:50:33 hsu Exp $ + * $DragonFly: src/sys/kern/link_elf.c,v 1.17 2005/03/04 00:01:30 dillon Exp $ */ #include @@ -141,10 +141,7 @@ link_elf_init(void* arg) dp = (Elf_Dyn*) &_DYNAMIC; if (dp) { - ef = malloc(sizeof(struct elf_file), M_LINKER, M_NOWAIT | M_ZERO); - if (ef == NULL) - panic("link_elf_init: Can't create linker structures for kernel"); - + ef = malloc(sizeof(struct elf_file), M_LINKER, M_INTWAIT | M_ZERO); ef->address = 0; #ifdef SPARSE_MAPPING ef->object = 0; -- 2.41.0