Module Name: src
Committed By: skrll
Date: Thu Feb 7 13:48:27 UTC 2019
Modified Files:
src/sys/dev/usb: umass.c umass_isdata.c umass_scsipi.c
Log Message:
Convert to kmem
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/usb/umass_isdata.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/usb/umass_scsipi.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/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.172 src/sys/dev/usb/umass.c:1.173
--- src/sys/dev/usb/umass.c:1.172 Thu Feb 7 13:43:44 2019
+++ src/sys/dev/usb/umass.c Thu Feb 7 13:48:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.172 2019/02/07 13:43:44 skrll Exp $ */
+/* $NetBSD: umass.c,v 1.173 2019/02/07 13:48:27 skrll Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.172 2019/02/07 13:43:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.173 2019/02/07 13:48:27 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -139,7 +139,7 @@ __KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
@@ -841,7 +841,7 @@ umass_detach(device_t self, int flags)
break;
}
- free(scbus, M_DEVBUF);
+ kmem_free(scbus, sizeof(*scbus));
sc->bus = NULL;
}
Index: src/sys/dev/usb/umass_isdata.c
diff -u src/sys/dev/usb/umass_isdata.c:1.40 src/sys/dev/usb/umass_isdata.c:1.41
--- src/sys/dev/usb/umass_isdata.c:1.40 Tue Jan 22 06:46:21 2019
+++ src/sys/dev/usb/umass_isdata.c Thu Feb 7 13:48:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_isdata.c,v 1.40 2019/01/22 06:46:21 skrll Exp $ */
+/* $NetBSD: umass_isdata.c,v 1.41 2019/02/07 13:48:27 skrll Exp $ */
/*
* TODO:
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.40 2019/01/22 06:46:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.41 2019/02/07 13:48:27 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: umass_isdata
#include <sys/device.h>
#include <sys/disklabel.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
#include <sys/proc.h>
#include <sys/systm.h>
@@ -196,7 +196,7 @@ umass_isdata_attach(struct umass_softc *
struct uisdata_softc *scbus;
struct isd200_config *cf;
- scbus = malloc(sizeof(*scbus), M_DEVBUF, M_WAITOK | M_ZERO);
+ scbus = kmem_zalloc(sizeof(*scbus), KM_SLEEP);
sc->bus = &scbus->base;
cf = &scbus->sc_isd_config;
@@ -209,7 +209,7 @@ umass_isdata_attach(struct umass_softc *
err = usbd_do_request(sc->sc_udev, &req, cf);
if (err) {
sc->bus = NULL;
- free(scbus, M_DEVBUF);
+ kmem_free(scbus, sizeof(*scbus));
return EIO;
}
DPRINTF(("umass_wd_attach info:\n EventNotification=0x%02x "
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.58 src/sys/dev/usb/umass_scsipi.c:1.59
--- src/sys/dev/usb/umass_scsipi.c:1.58 Thu Feb 7 13:20:41 2019
+++ src/sys/dev/usb/umass_scsipi.c Thu Feb 7 13:48:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.58 2019/02/07 13:20:41 skrll Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.59 2019/02/07 13:48:27 skrll Exp $ */
/*
* Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.58 2019/02/07 13:20:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.59 2019/02/07 13:48:27 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -48,6 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: umass_scsipi
#include <sys/disk.h> /* XXX */
#include <sys/ioctl.h>
#include <sys/kernel.h>
+#include <sys/kmem.h>
#include <sys/lwp.h>
#include <sys/malloc.h>
#include <sys/systm.h>
@@ -189,7 +190,7 @@ umass_scsipi_setup(struct umass_softc *s
{
struct umass_scsipi_softc *scbus;
- scbus = malloc(sizeof(*scbus), M_DEVBUF, M_WAITOK | M_ZERO);
+ scbus = kmem_zalloc(sizeof(*scbus), KM_SLEEP);
sc->bus = &scbus->base;
/* Only use big commands for USB SCSI devices. */
