CVS commit: src/sys/arch/mmeye/dev

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Sat Nov 21 18:23:36 UTC 2020

Modified Files:
        src/sys/arch/mmeye/dev: mmeyepcmcia.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mmeye/dev/mmeyepcmcia.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/mmeye/dev/mmeyepcmcia.c
diff -u src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.22 src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.23
--- src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.22	Sat Oct 27 17:18:03 2012
+++ src/sys/arch/mmeye/dev/mmeyepcmcia.c	Sat Nov 21 18:23:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: mmeyepcmcia.c,v 1.22 2012/10/27 17:18:03 chs Exp $	*/
+/*	$NetBSD: mmeyepcmcia.c,v 1.23 2020/11/21 18:23:36 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.22 2012/10/27 17:18:03 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.23 2020/11/21 18:23:36 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/extent.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/bus.h>
 
@@ -408,9 +408,9 @@ mmeyepcmcia_event_thread(void *arg)
 					break;
 				if (pe2->pe_type == MMEYEPCMCIA_EVENT_INSERTION) {
 					SIMPLEQ_REMOVE_HEAD(&h->events, pe_q);
-					free(pe1, M_TEMP);
+					kmem_free(pe1, sizeof(*pe1));
 					SIMPLEQ_REMOVE_HEAD(&h->events, pe_q);
-					free(pe2, M_TEMP);
+					kmem_free(pe2, sizeof(*pe2));
 				}
 			}
 			splx(s);
@@ -432,9 +432,9 @@ mmeyepcmcia_event_thread(void *arg)
 					break;
 				if (pe2->pe_type == MMEYEPCMCIA_EVENT_REMOVAL) {
 					SIMPLEQ_REMOVE_HEAD(&h->events, pe_q);
-					free(pe1, M_TEMP);
+					kmem_free(pe1, sizeof(*pe1));
 					SIMPLEQ_REMOVE_HEAD(&h->events, pe_q);
-					free(pe2, M_TEMP);
+					kmem_free(pe2, sizeof(*pe2));
 				}
 			}
 			splx(s);
@@ -447,7 +447,7 @@ mmeyepcmcia_event_thread(void *arg)
 			panic("mmeyepcmcia_event_thread: unknown event %d",
 			    pe->pe_type);
 		}
-		free(pe, M_TEMP);
+		kmem_free(pe, sizeof(*pe));
 	}
 
 	h->event_thread = NULL;
@@ -590,7 +590,7 @@ mmeyepcmcia_queue_event(struct mmeyepcmc
 	struct mmeyepcmcia_event *pe;
 	int s;
 
-	pe = malloc(sizeof(*pe), M_TEMP, M_NOWAIT);
+	pe = kmem_intr_alloc(sizeof(*pe), KM_NOSLEEP);
 	if (pe == NULL)
 		panic("mmeyepcmcia_queue_event: can't allocate event");