Module Name: src
Committed By: tsutsui
Date: Fri Jul 18 18:17:54 UTC 2014
Modified Files:
src/sys/arch/luna68k/dev: lunafb.c
Log Message:
Use kmem(9) instead of malloc(9).
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/luna68k/dev/lunafb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/dev/lunafb.c
diff -u src/sys/arch/luna68k/dev/lunafb.c:1.32 src/sys/arch/luna68k/dev/lunafb.c:1.33
--- src/sys/arch/luna68k/dev/lunafb.c:1.32 Fri Jul 18 18:03:36 2014
+++ src/sys/arch/luna68k/dev/lunafb.c Fri Jul 18 18:17:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.32 2014/07/18 18:03:36 tsutsui Exp $ */
+/* $NetBSD: lunafb.c,v 1.33 2014/07/18 18:17:54 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,14 +31,14 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.32 2014/07/18 18:03:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.33 2014/07/18 18:17:54 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/mman.h>
#include <sys/proc.h>
#include <sys/tty.h>
@@ -206,8 +206,8 @@ omfbattach(device_t parent, device_t sel
sc->sc_dc = &omfb_console_dc;
sc->nscreens = 1;
} else {
- sc->sc_dc = malloc(sizeof(struct om_hwdevconfig),
- M_DEVBUF, M_WAITOK | M_ZERO);
+ sc->sc_dc = kmem_zalloc(sizeof(struct om_hwdevconfig),
+ KM_SLEEP);
omfb_getdevconfig(OMFB_FB_WADDR, sc->sc_dc);
}
aprint_normal(": %d x %d, %dbpp\n", sc->sc_dc->dc_wid, sc->sc_dc->dc_ht,
