diff options
| author | macallan <macallan@NetBSD.org> | 2012-05-23 21:47:23 +0000 |
|---|---|---|
| committer | macallan <macallan@NetBSD.org> | 2012-05-23 21:47:23 +0000 |
| commit | 63fa83be3adbd65565b4afdbe828746aefa4eafc (patch) | |
| tree | be008da36517ac0cd0467d3d88d11d42755bdffe /sys/arch/macppc/dev | |
| parent | f976cec795869fa18701b3e71f2315bc94ba7329 (diff) | |
malloc -> kmem_alloc
Diffstat (limited to 'sys/arch/macppc/dev')
| -rw-r--r-- | sys/arch/macppc/dev/dbdma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/macppc/dev/dbdma.c b/sys/arch/macppc/dev/dbdma.c index 9579ce65e5a..da089946d05 100644 --- a/sys/arch/macppc/dev/dbdma.c +++ b/sys/arch/macppc/dev/dbdma.c @@ -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 @@ dbdma_start(dbdma_regmap_t *dmap, dbdma_command_t *commands) 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 @@ dbdma_alloc(int size) { 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; |
