CVS commit: src/sys/arch/bebox/bebox

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Wed Nov 18 03:46:25 UTC 2020

Modified Files:
        src/sys/arch/bebox/bebox: mainbus.c pic_bebox.c

Log Message:
malloc(9) -> kmem(9)


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/bebox/bebox/mainbus.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/bebox/bebox/pic_bebox.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/bebox/bebox/mainbus.c
diff -u src/sys/arch/bebox/bebox/mainbus.c:1.32 src/sys/arch/bebox/bebox/mainbus.c:1.33
--- src/sys/arch/bebox/bebox/mainbus.c:1.32	Tue Jul  7 03:38:46 2020
+++ src/sys/arch/bebox/bebox/mainbus.c	Wed Nov 18 03:46:25 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.32 2020/07/07 03:38:46 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.33 2020/11/18 03:46:25 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -31,12 +31,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.32 2020/07/07 03:38:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.33 2020/11/18 03:46:25 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 
 #include <machine/autoconf.h>
 #include <sys/bus.h>
@@ -123,12 +123,10 @@ mainbus_attach(device_t parent, device_t
 	 */
 
 #if NPCI > 0
-	genppc_pct = malloc(sizeof(struct genppc_pci_chipset), M_DEVBUF,
-	    M_WAITOK);
+	genppc_pct = kmem_alloc(sizeof(struct genppc_pci_chipset), KM_SLEEP);
 	bebox_pci_get_chipset_tag(genppc_pct);
 
-	pbi = malloc(sizeof(struct genppc_pci_chipset_businfo),
-	    M_DEVBUF, M_WAITOK);
+	pbi = kmem_alloc(sizeof(struct genppc_pci_chipset_businfo), KM_SLEEP);
 	pbi->pbi_properties = prop_dictionary_create();
         KASSERT(pbi->pbi_properties != NULL);
 

Index: src/sys/arch/bebox/bebox/pic_bebox.c
diff -u src/sys/arch/bebox/bebox/pic_bebox.c:1.11 src/sys/arch/bebox/bebox/pic_bebox.c:1.12
--- src/sys/arch/bebox/bebox/pic_bebox.c:1.11	Sun Nov 10 21:16:25 2019
+++ src/sys/arch/bebox/bebox/pic_bebox.c	Wed Nov 18 03:46:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_bebox.c,v 1.11 2019/11/10 21:16:25 chs Exp $ */
+/* $NetBSD: pic_bebox.c,v 1.12 2020/11/18 03:46:25 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,12 +30,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_bebox.c,v 1.11 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_bebox.c,v 1.12 2020/11/18 03:46:25 thorpej Exp $");
 
 #include "opt_multiprocessor.h"
 
 #include <sys/param.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/kernel.h>
 
 #include <uvm/uvm_extern.h>
@@ -57,7 +57,7 @@ setup_bebox_intr(void)
 {
 	struct pic_ops *pic;
 
-	pic = malloc(sizeof(struct pic_ops), M_DEVBUF, M_WAITOK);
+	pic = kmem_alloc(sizeof(struct pic_ops), KM_SLEEP);
 	pic->pic_numintrs = 32;
 	pic->pic_cookie = (void *)BEBOX_REG;
 	pic->pic_enable_irq = bebox_enable_irq;