Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/arm/xscale/pxa2x0_lcd.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/arm/xscale/pxa2x0_lcd.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- src/sys/arch/arm/xscale/pxa2x0_lcd.c	2019/11/10 21:16:24	1.37
+++ src/sys/arch/arm/xscale/pxa2x0_lcd.c	2020/11/20 18:49:45	1.38
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_lcd.c,v 1.37 2019/11/10 21:16:24 chs Exp $ */
+/* $NetBSD: pxa2x0_lcd.c,v 1.38 2020/11/20 18:49:45 thorpej Exp $ */
 
 /*
  * Copyright (c) 2002  Genetec Corporation.  All rights reserved.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.37 2019/11/10 21:16:24 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c,v 1.38 2020/11/20 18:49:45 thorpej Exp $");
 
 #include "opt_pxa2x0_lcd.h"
 
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/kernel.h>			/* for cold */
 
 #include <uvm/uvm_extern.h>
@@ -515,7 +515,7 @@ pxa2x0_lcd_new_screen(struct pxa2x0_lcd_
 		return EINVAL;
 	}
 
-	scr = malloc(sizeof(*scr), M_DEVBUF, M_WAITOK | M_ZERO);
+	scr = kmem_zalloc(sizeof(*scr), KM_SLEEP);
 	scr->nsegs = 0;
 	scr->depth = depth;
 	scr->buf_size = size;
@@ -627,7 +627,7 @@ pxa2x0_lcd_new_screen(struct pxa2x0_lcd_
 			bus_dmamem_unmap(dma_tag, scr->buf_va, size);
 		if (scr->nsegs)
 			bus_dmamem_free(dma_tag, scr->segs, scr->nsegs);
-		free(scr, M_DEVBUF);
+		kmem_free(scr, sizeof(*scr));
 	}
 	*scrpp = NULL;
 	return error;
@@ -850,7 +850,7 @@ pxa2x0_lcd_free_screen(void *v, void *co
 		bus_dmamem_unmap(sc->dma_tag, scr->buf_va, scr->map_size);
 	if (scr->nsegs > 0)
 		bus_dmamem_free(sc->dma_tag, scr->segs, scr->nsegs);
-	free(scr, M_DEVBUF);
+	kmem_free(scr, sizeof(*scr));
 }
 
 int