diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2009-02-17 17:01:41 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2009-02-17 17:01:41 +0000 |
| commit | 3bc515352fc221b7fdf484a18e6016de6bf483f7 (patch) | |
| tree | ab8d351416a99488a8cf58607e4f48d328cf655d /sys/dev/wsfb | |
| parent | 0497bce990ae8fee3666480b6417878bbc8c36b4 (diff) | |
Use kmem_alloc instead of malloc for shadowfb
Diffstat (limited to 'sys/dev/wsfb')
| -rw-r--r-- | sys/dev/wsfb/genfb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/wsfb/genfb.c b/sys/dev/wsfb/genfb.c index d677b48e5c7..9283e32df6a 100644 --- a/sys/dev/wsfb/genfb.c +++ b/sys/dev/wsfb/genfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: genfb.c,v 1.22 2009/02/17 02:41:11 jmcneill Exp $ */ +/* $NetBSD: genfb.c,v 1.23 2009/02/17 17:01:41 jmcneill Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.22 2009/02/17 02:41:11 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.23 2009/02/17 17:01:41 jmcneill Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.22 2009/02/17 02:41:11 jmcneill Exp $"); #include <sys/ioctl.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/malloc.h> +#include <sys/kmem.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsdisplayvar.h> @@ -182,8 +182,8 @@ genfb_attach(struct genfb_softc *sc, struct genfb_ops *ops) memcpy(&sc->sc_ops, ops, sizeof(struct genfb_ops)); sc->sc_mode = WSDISPLAYIO_MODE_EMUL; - sc->sc_shadowfb = malloc(sc->sc_fbsize, M_DEVBUF, M_WAITOK); - if (sc->sc_want_clear == false) + sc->sc_shadowfb = kmem_alloc(sc->sc_fbsize, KM_SLEEP); + if (sc->sc_want_clear == false && sc->sc_shadowfb != NULL) memcpy(sc->sc_shadowfb, sc->sc_fbaddr, sc->sc_fbsize); vcons_init(&sc->vd, sc, &sc->sc_defaultscreen_descr, |
