kernel: Use M_ZERO for kmalloc() instead of bzero()ing.

diff --git a/sys/dev/misc/tbridge/safe_mem.c b/sys/dev/misc/tbridge/safe_mem.c
index e99f9f7..1b56f8a 100644 (file)
--- a/sys/dev/misc/tbridge/safe_mem.c
+++ b/sys/dev/misc/tbridge/safe_mem.c
@@ -78,10 +78,7 @@ _alloc_safe_mem(size_t req_sz, const char *file, int line)
 
        /* only shift, to make sure things (TM) keep aligned */
        alloc_sz = req_sz;
-       mem = kmalloc(alloc_sz << 2, M_SAFEMEM, M_WAITOK);
-
-       bzero(mem, alloc_sz << 2);
-
+       mem = kmalloc(alloc_sz << 2, M_SAFEMEM, M_WAITOK | M_ZERO);
        user_mem = mem + alloc_sz;
        hdr = (struct safe_mem_hdr *)(user_mem - sizeof(*hdr));
        tail = (struct safe_mem_tail *)(user_mem + alloc_sz);

diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 0a0c740..9fb83c8 100644 (file)
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/kern_linker.c,v 1.41.2.3 2001/11/21 17:50:35 luigi Exp $
- * $DragonFly: src/sys/kern/kern_linker.c,v 1.44 2008/09/01 19:39:44 dillon Exp $
  */
 
 #include "opt_ddb.h"
@@ -441,9 +440,7 @@ linker_make_file(const char* pathname, void* priv, struct linker_file_ops* ops)
 
     KLD_DPF(FILE, ("linker_make_file: new file, filename=%s\n", filename));
     lockmgr(&lock, LK_EXCLUSIVE);
-    lf = kmalloc(sizeof(struct linker_file), M_LINKER, M_WAITOK);
-    bzero(lf, sizeof(*lf));
-
+    lf = kmalloc(sizeof(struct linker_file), M_LINKER, M_WAITOK | M_ZERO);
     lf->refs = 1;
     lf->userrefs = 0;
     lf->flags = 0;