[src/trunk]: src/sys/arch/macppc/dev malloc -> kmem_alloc

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c954877349cc
branches:  trunk
changeset: 779378:c954877349cc
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed May 23 21:47:23 2012 +0000

description:
malloc -> kmem_alloc

diffstat:

 sys/arch/macppc/dev/dbdma.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 29e8573ac7a3 -r c954877349cc sys/arch/macppc/dev/dbdma.c
--- a/sys/arch/macppc/dev/dbdma.c       Wed May 23 21:46:17 2012 +0000
+++ b/sys/arch/macppc/dev/dbdma.c       Wed May 23 21:47:23 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dbdma.c,v 1.10 2010/11/14 03:57:17 uebayasi Exp $      */
+/*     $NetBSD: dbdma.c,v 1.11 2012/05/23 21:47:23 macallan Exp $      */
 
 /*
  * Copyright 1991-1998 by Open Software Foundation, Inc. 
@@ -23,10 +23,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbdma.c,v 1.10 2010/11/14 03:57:17 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbdma.c,v 1.11 2012/05/23 21:47:23 macallan Exp $");
 
 #include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/systm.h>
 
 #include <prop/proplib.h>
@@ -45,7 +45,7 @@
        unsigned long addr = vtophys((vaddr_t)commands);
 
        if (addr & 0xf)
-               panic("dbdma_start command structure not 16-byte aligned");
+               panic("dbdma_start command structure not 16-byte aligned %08x %08x", (uint32_t)commands, (uint32_t)addr);
 
        dmap->d_intselect = 0xff;  /* Endian magic - clear out interrupts */
        DBDMA_ST4_ENDIAN(&dmap->d_control, 
@@ -119,7 +119,7 @@
 {
        u_int buf;
 
-       buf = (u_int)malloc(size + 0x0f, M_DEVBUF, M_WAITOK);
+       buf = (u_int)kmem_alloc(size + 0x0f, KM_SLEEP);
        buf = (buf + 0x0f) & ~0x0f;
 
        return (dbdma_command_t *)buf;