Module Name: src
Committed By: thorpej
Date: Sat Nov 21 21:07:38 UTC 2020
Modified Files:
src/sys/arch/hpcsh/dev/hd64461: hd64461pcmcia.c
src/sys/arch/hpcsh/dev/hd64465: hd64465pcmcia.c
src/sys/arch/hpcsh/hpcsh: bus_space.c
Log Message:
malloc(9) -> kmem(9)
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcsh/hpcsh/bus_space.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/hpcsh/dev/hd64461/hd64461pcmcia.c
diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.51 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.52
--- src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.51 Sat Nov 9 02:54:11 2013
+++ src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c Sat Nov 21 21:07:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64461pcmcia.c,v 1.51 2013/11/09 02:54:11 christos Exp $ */
+/* $NetBSD: hd64461pcmcia.c,v 1.52 2020/11/21 21:07:38 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.51 2013/11/09 02:54:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.52 2020/11/21 21:07:38 thorpej Exp $");
#include "opt_hd64461pcmcia.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/kthread.h>
#include <sys/boot_flag.h>
#include <sys/bus.h>
@@ -615,10 +615,9 @@ hd64461pcmcia_chip_mem_map(pcmcia_chipse
struct hd64461pcmcia_window_cookie *cookie;
bus_addr_t ofs;
- cookie = malloc(sizeof(struct hd64461pcmcia_window_cookie),
- M_DEVBUF, M_NOWAIT);
- KASSERT(cookie);
- memset(cookie, 0, sizeof(struct hd64461pcmcia_window_cookie));
+ cookie = kmem_zalloc(sizeof(struct hd64461pcmcia_window_cookie),
+ KM_SLEEP);
+ KASSERT(cookie != NULL);
/* Address */
if ((kind & ~PCMCIA_WIDTH_MEM_MASK) == PCMCIA_MEM_ATTR) {
@@ -654,7 +653,7 @@ hd64461pcmcia_chip_mem_map(pcmcia_chipse
return (0);
bad:
DPRINTF("%#lx-%#lx map failed.\n", card_addr, size);
- free(cookie, M_DEVBUF);
+ kmem_free(cookie, sizeof(*cookie));
return (1);
}
@@ -668,7 +667,7 @@ hd64461pcmcia_chip_mem_unmap(pcmcia_chip
bus_space_unmap(cookie->wc_tag, cookie->wc_handle,
cookie->wc_size);
DPRINTF("%#lx-%#x\n", cookie->wc_handle, cookie->wc_size);
- free(cookie, M_DEVBUF);
+ kmem_free(cookie, sizeof(*cookie));
}
STATIC int
Index: src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c
diff -u src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.32 src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.33
--- src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.32 Mon Oct 29 13:46:26 2012
+++ src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c Sat Nov 21 21:07:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64465pcmcia.c,v 1.32 2012/10/29 13:46:26 chs Exp $ */
+/* $NetBSD: hd64465pcmcia.c,v 1.33 2020/11/21 21:07:38 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,12 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.32 2012/10/29 13:46:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.33 2020/11/21 21:07:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/kthread.h>
#include <sys/boot_flag.h>
#include <sys/bus.h>
@@ -536,10 +536,9 @@ hd64465pcmcia_chip_mem_map(pcmcia_chipse
struct hd64465pcmcia_window_cookie *cookie;
bus_addr_t ofs;
- cookie = malloc(sizeof(struct hd64465pcmcia_window_cookie),
- M_DEVBUF, M_NOWAIT);
+ cookie = kmem_zalloc(sizeof(struct hd64465pcmcia_window_cookie),
+ KM_SLEEP);
KASSERT(cookie);
- memset(cookie, 0, sizeof(struct hd64465pcmcia_window_cookie));
/* Address */
if ((kind & ~PCMCIA_WIDTH_MEM_MASK) == PCMCIA_MEM_ATTR) {
@@ -574,7 +573,7 @@ hd64465pcmcia_chip_mem_map(pcmcia_chipse
return (0);
bad:
DPRINTF("%#lx-%#lx map failed.\n", card_addr, size);
- free(cookie, M_DEVBUF);
+ kmem_free(cookie, sizeof(*cookie));
return (1);
}
@@ -588,7 +587,7 @@ hd64465pcmcia_chip_mem_unmap(pcmcia_chip
bus_space_unmap(cookie->wc_tag, cookie->wc_handle,
cookie->wc_size);
DPRINTF("%#lx-%#x\n", cookie->wc_handle, cookie->wc_size);
- free(cookie, M_DEVBUF);
+ kmem_free(cookie, sizeof(*cookie));
}
int
Index: src/sys/arch/hpcsh/hpcsh/bus_space.c
diff -u src/sys/arch/hpcsh/hpcsh/bus_space.c:1.19 src/sys/arch/hpcsh/hpcsh/bus_space.c:1.20
--- src/sys/arch/hpcsh/hpcsh/bus_space.c:1.19 Fri Jan 27 18:52:57 2012
+++ src/sys/arch/hpcsh/hpcsh/bus_space.c Sat Nov 21 21:07:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.19 2012/01/27 18:52:57 para Exp $ */
+/* $NetBSD: bus_space.c,v 1.20 2020/11/21 21:07:38 thorpej Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -27,13 +27,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.19 2012/01/27 18:52:57 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.20 2020/11/21 21:07:38 thorpej Exp $");
#include "debug_hpcsh.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/extent.h>
#include <sys/bus.h>
@@ -141,7 +141,7 @@ bus_space_create(struct hpcsh_bus_space
{
if (hbs == NULL) {
- hbs = malloc(sizeof(*hbs), M_DEVBUF, M_NOWAIT | M_ZERO);
+ hbs = kmem_zalloc(sizeof(*hbs), KM_SLEEP);
hbs->hbs_flags = HBS_FLAGS_ALLOCATED;
} else
memset(hbs, 0, sizeof(*hbs));
@@ -176,7 +176,7 @@ bus_space_destroy(bus_space_tag_t t)
extent_destroy(ex);
if (hbs->hbs_flags & HBS_FLAGS_ALLOCATED)
- free(hbs, M_DEVBUF);
+ kmem_free(hbs, sizeof(*hbs));
}
/* default bus_space tag */
