Module Name: src Committed By: thorpej Date: Mon Jan 4 18:14:38 UTC 2021
Modified Files: src/sys/arch/mips/ralink: ralink_intr.c Log Message: malloc(9) -> kmem(9) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/ralink/ralink_intr.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/mips/ralink/ralink_intr.c diff -u src/sys/arch/mips/ralink/ralink_intr.c:1.6 src/sys/arch/mips/ralink/ralink_intr.c:1.7 --- src/sys/arch/mips/ralink/ralink_intr.c:1.6 Sun Nov 10 21:16:30 2019 +++ src/sys/arch/mips/ralink/ralink_intr.c Mon Jan 4 18:14:38 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ralink_intr.c,v 1.6 2019/11/10 21:16:30 chs Exp $ */ +/* $NetBSD: ralink_intr.c,v 1.7 2021/01/04 18:14:38 thorpej Exp $ */ /*- * Copyright (c) 2011 CradlePoint Technology, Inc. * All rights reserved. @@ -29,14 +29,14 @@ #define __INTR_PRIVATE #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ralink_intr.c,v 1.6 2019/11/10 21:16:30 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ralink_intr.c,v 1.7 2021/01/04 18:14:38 thorpej Exp $"); #include <sys/param.h> #include <sys/bus.h> #include <sys/device.h> #include <sys/intr.h> #include <sys/kernel.h> -#include <sys/malloc.h> +#include <sys/kmem.h> #include <sys/systm.h> #include <mips/locore.h> @@ -267,7 +267,7 @@ ra_intr_establish(int intr, int (*func)( { struct evbmips_intrhand *ih; - ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK); + ih = kmem_alloc(sizeof(*ih), KM_SLEEP); ih->ih_func = func; ih->ih_arg = arg; ih->ih_irq = intr; @@ -310,7 +310,7 @@ ra_intr_disestablish(void *arg) splx(s); - free(ih, M_DEVBUF); + kmem_free(ih, sizeof(*ih)); } /*