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

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Sat Dec 19 15:18:04 UTC 2020

Modified Files:
        src/sys/arch/atari/dev: event.c

Log Message:
- malloc(9) -> kmem(9)
- Use sel{record,remove}_knote().


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/atari/dev/event.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/atari/dev/event.c
diff -u src/sys/arch/atari/dev/event.c:1.14 src/sys/arch/atari/dev/event.c:1.15
--- src/sys/arch/atari/dev/event.c:1.14	Wed Oct 25 08:12:37 2017
+++ src/sys/arch/atari/dev/event.c	Sat Dec 19 15:18:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: event.c,v 1.14 2017/10/25 08:12:37 maya Exp $	*/
+/*	$NetBSD: event.c,v 1.15 2020/12/19 15:18:04 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -47,11 +47,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.14 2017/10/25 08:12:37 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.15 2020/12/19 15:18:04 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
@@ -61,6 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: event.c,v 1.
 #include <atari/dev/vuid_event.h>
 #include <atari/dev/event_var.h>
 
+#define	EV_Q_ALLOCSIZE		(EV_QSIZE * sizeof(struct firm_event))
+
 /*
  * Initialize a firm_event queue.
  */
@@ -69,8 +71,7 @@ ev_init(register struct evvar *ev)
 {
 
 	ev->ev_get = ev->ev_put = 0;
-	ev->ev_q = malloc((u_long)EV_QSIZE * sizeof(struct firm_event),
-	    M_DEVBUF, M_WAITOK|M_ZERO);
+	ev->ev_q = kmem_zalloc(EV_Q_ALLOCSIZE, KM_SLEEP);
 	selinit(&ev->ev_sel);
 }
 
@@ -82,7 +83,7 @@ ev_fini(register struct evvar *ev)
 {
 
 	seldestroy(&ev->ev_sel);
-	free(ev->ev_q, M_DEVBUF);
+	kmem_free(ev->ev_q, EV_Q_ALLOCSIZE);
 }
 
 /*
@@ -166,7 +167,7 @@ filt_evrdetach(struct knote *kn)
 	int s;
 
 	s = splev();
-	SLIST_REMOVE(&ev->ev_sel.sel_klist, kn, knote, kn_selnext);
+	selremove_knote(&ev->ev_sel, kn);
 	splx(s);
 }
 
@@ -199,12 +200,10 @@ static const struct filterops ev_filtops
 int
 ev_kqfilter(struct evvar *ev, struct knote *kn)
 {
-	struct klist *klist;
 	int s;
 
 	switch (kn->kn_filter) {
 	case EVFILT_READ:
-		klist = &ev->ev_sel.sel_klist;
 		kn->kn_fop = &ev_filtops;
 		break;
 
@@ -215,7 +214,7 @@ ev_kqfilter(struct evvar *ev, struct kno
 	kn->kn_hook = ev;
 
 	s = splev();
-	SLIST_INSERT_HEAD(klist, kn, kn_selnext);
+	selrecord_knote(&ev->ev_sel, kn);
 	splx(s);
 
 	return (0);