diff options
| author | cegger <cegger@NetBSD.org> | 2008-12-17 20:51:31 +0000 |
|---|---|---|
| committer | cegger <cegger@NetBSD.org> | 2008-12-17 20:51:31 +0000 |
| commit | 9b87d582bdf58e8566275afe8449158af3ad5e2d (patch) | |
| tree | c8c7d766a6e7c842404ffbf46ec0c4ada9382bea /sys/compat/linux/common/linux_exec.c | |
| parent | c60be09da192479614ef688c231d09320715c12d (diff) | |
kill MALLOC and FREE macros.
Diffstat (limited to 'sys/compat/linux/common/linux_exec.c')
| -rw-r--r-- | sys/compat/linux/common/linux_exec.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/compat/linux/common/linux_exec.c b/sys/compat/linux/common/linux_exec.c index 446961d0f6f..38e124bd4ea 100644 --- a/sys/compat/linux/common/linux_exec.c +++ b/sys/compat/linux/common/linux_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec.c,v 1.109 2008/11/19 18:36:03 ad Exp $ */ +/* $NetBSD: linux_exec.c,v 1.110 2008/12/17 20:51:33 cegger Exp $ */ /*- * Copyright (c) 1994, 1995, 1998, 2000, 2007, 2008 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.109 2008/11/19 18:36:03 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.110 2008/12/17 20:51:33 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -139,13 +139,13 @@ linux_e_proc_init(p, parent, forkflags) if (!e) { /* allocate new Linux emuldata */ - MALLOC(e, void *, sizeof(struct linux_emuldata), + e = malloc(sizeof(struct linux_emuldata), M_EMULDATA, M_WAITOK); } else { mutex_enter(proc_lock); e->s->refs--; if (e->s->refs == 0) - FREE(e->s, M_EMULDATA); + free(e->s, M_EMULDATA); mutex_exit(proc_lock); } @@ -163,7 +163,7 @@ linux_e_proc_init(p, parent, forkflags) if (ep == NULL) { killproc(p, "FORK_SHAREVM while emuldata is NULL\n"); mutex_exit(proc_lock); - FREE(e, M_EMULDATA); + free(e, M_EMULDATA); return; } #endif @@ -172,7 +172,7 @@ linux_e_proc_init(p, parent, forkflags) } else { struct vmspace *vm; - MALLOC(s, void *, sizeof(struct linux_emuldata_shared), + s = malloc(sizeof(struct linux_emuldata_shared), M_EMULDATA, M_WAITOK); s->refs = 1; @@ -256,10 +256,10 @@ linux_e_proc_exit(struct proc *p) /* free Linux emuldata and set the pointer to null */ e->s->refs--; if (e->s->refs == 0) - FREE(e->s, M_EMULDATA); + free(e->s, M_EMULDATA); p->p_emuldata = NULL; mutex_exit(proc_lock); - FREE(e, M_EMULDATA); + free(e, M_EMULDATA); } /* |
