summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2020-05-23 23:42:41 +0000
committerad <ad@NetBSD.org>2020-05-23 23:42:41 +0000
commit14b4bbb24d6307d383b4d1c8f1052fe81cf5beb2 (patch)
tree00ff6cdcca84c5de9e4fff774e642f8a928ff7b4 /sys/dev
parent916d033fe882bad0aedd42f1df59477372c9f5bd (diff)
Move proc_lock into the data segment. It was dynamically allocated because
at the time we had mutex_obj_alloc() but not __cacheline_aligned.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/audio/audio.c12
-rw-r--r--sys/dev/lockstat.c8
-rw-r--r--sys/dev/midi.c12
-rw-r--r--sys/dev/pci/bktr/bktr_core.c18
-rw-r--r--sys/dev/sbus/bpp.c16
-rw-r--r--sys/dev/sequencer.c12
-rw-r--r--sys/dev/usb/uhid.c38
-rw-r--r--sys/dev/usb/usb.c20
-rw-r--r--sys/dev/wscons/wsdisplay_compat_usl.c10
-rw-r--r--sys/dev/wscons/wsevent.c8
10 files changed, 77 insertions, 77 deletions
diff --git a/sys/dev/audio/audio.c b/sys/dev/audio/audio.c
index 0e8a637f2ce..3a1a1553be2 100644
--- a/sys/dev/audio/audio.c
+++ b/sys/dev/audio/audio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.69 2020/05/01 08:21:27 isaki Exp $ */
+/* $NetBSD: audio.c,v 1.70 2020/05/23 23:42:42 ad Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.69 2020/05/01 08:21:27 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.70 2020/05/23 23:42:42 ad Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -5988,11 +5988,11 @@ audio_psignal(struct audio_softc *sc, pid_t pid, int signum)
* psignal() must be called without spin lock held.
*/
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
p = proc_find(pid);
if (p)
psignal(p, signum);
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
}
/*
@@ -7993,11 +7993,11 @@ mixer_signal(struct audio_softc *sc)
KASSERT(sc->sc_exlock);
for (i = 0; i < sc->sc_am_used; i++) {
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
p = proc_find(sc->sc_am[i]);
if (p)
psignal(p, SIGIO);
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
}
}
diff --git a/sys/dev/lockstat.c b/sys/dev/lockstat.c
index b2db655caa9..4f436c5311e 100644
--- a/sys/dev/lockstat.c
+++ b/sys/dev/lockstat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lockstat.c,v 1.26 2019/11/23 17:32:10 ad Exp $ */
+/* $NetBSD: lockstat.c,v 1.27 2020/05/23 23:42:42 ad Exp $ */
/*-
* Copyright (c) 2006, 2007, 2019 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.26 2019/11/23 17:32:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lockstat.c,v 1.27 2020/05/23 23:42:42 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -283,13 +283,13 @@ lockstat_stop(lsdisable_t *ld)
lockstat_init_tables(NULL);
/* Run through all LWPs and clear the slate for the next run. */
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
LIST_FOREACH(l, &alllwp, l_list) {
l->l_pfailaddr = 0;
l->l_pfailtime = 0;
l->l_pfaillock = 0;
}
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
if (ld == NULL)
return error;
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index e3d4533b9c7..4949cc1feca 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midi.c,v 1.89 2019/05/08 13:40:17 isaki Exp $ */
+/* $NetBSD: midi.c,v 1.90 2020/05/23 23:42:42 ad Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.89 2019/05/08 13:40:17 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.90 2020/05/23 23:42:42 ad Exp $");
#ifdef _KERNEL_OPT
#include "midi.h"
@@ -676,11 +676,11 @@ midi_softint(void *cookie)
sc = cookie;
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
pid = sc->async;
if (pid != 0 && (p = proc_find(pid)) != NULL)
psignal(p, SIGIO);
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
}
static void
@@ -1643,7 +1643,7 @@ midiioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
case FIOASYNC:
mutex_exit(sc->lock);
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if (*(int *)addr) {
if (sc->async) {
error = EBUSY;
@@ -1655,7 +1655,7 @@ midiioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l)
} else {
sc->async = 0;
}
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
mutex_enter(sc->lock);
break;
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index c0900c3d023..86808b5d639 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */
-/* $NetBSD: bktr_core.c,v 1.57 2020/02/23 10:30:43 skrll Exp $ */
+/* $NetBSD: bktr_core.c,v 1.58 2020/05/23 23:42:42 ad Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */
/*
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.57 2020/02/23 10:30:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.58 2020/05/23 23:42:42 ad Exp $");
#include "opt_bktr.h" /* Include any kernel config options */
@@ -958,12 +958,12 @@ bktr_softintr(void *cookie)
bktr = cookie;
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if (bktr->proc && !(bktr->signal & METEOR_SIG_MODE_MASK)) {
psignal(bktr->proc,
bktr->signal&(~METEOR_SIG_MODE_MASK));
}
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
}
/*
@@ -977,9 +977,9 @@ video_open(bktr_ptr_t bktr)
if (bktr->flags & METEOR_OPEN) /* device is busy */
return(EBUSY);
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
bktr->proc = NULL;
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
bktr->flags |= METEOR_OPEN;
@@ -1592,9 +1592,9 @@ video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg,
break;
case METEORSSIGNAL:
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if(*(int *)arg == 0 || *(int *)arg >= NSIG) {
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
return(EINVAL);
break;
}
@@ -1604,7 +1604,7 @@ video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg,
#else
bktr->proc = l->l_proc;
#endif
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
break;
case METEORGSIGNAL:
diff --git a/sys/dev/sbus/bpp.c b/sys/dev/sbus/bpp.c
index 17f8e84160e..76cf6fabb71 100644
--- a/sys/dev/sbus/bpp.c
+++ b/sys/dev/sbus/bpp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bpp.c,v 1.44 2019/11/10 21:16:37 chs Exp $ */
+/* $NetBSD: bpp.c,v 1.45 2020/05/23 23:42:42 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.44 2019/11/10 21:16:37 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.45 2020/05/23 23:42:42 ad Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -301,9 +301,9 @@ bppclose(dev_t dev, int flags, int mode, struct lwp *l)
irq &= ~BPP_ALLEN;
bus_space_write_2(lsi->sc_bustag, lsi->sc_regs, L64854_REG_ICR, irq);
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
sc->sc_asyncproc = NULL;
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
sc->sc_flags = 0;
return 0;
}
@@ -458,7 +458,7 @@ bppioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
splx(s);
break;
case FIOASYNC:
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if (*(int *)data) {
if (sc->sc_asyncproc != NULL)
error = EBUSY;
@@ -466,7 +466,7 @@ bppioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
sc->sc_asyncproc = p;
} else
sc->sc_asyncproc = NULL;
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
break;
default:
break;
@@ -629,8 +629,8 @@ bppsoftintr(void *cookie)
{
struct bpp_softc *sc = cookie;
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if (sc->sc_asyncproc)
psignal(sc->sc_asyncproc, SIGIO);
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
}
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c
index f728100bd37..3cbeb6ca9d0 100644
--- a/sys/dev/sequencer.c
+++ b/sys/dev/sequencer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sequencer.c,v 1.71 2019/08/25 07:10:30 maxv Exp $ */
+/* $NetBSD: sequencer.c,v 1.72 2020/05/23 23:42:42 ad Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.71 2019/08/25 07:10:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.72 2020/05/23 23:42:42 ad Exp $");
#ifdef _KERNEL_OPT
#include "sequencer.h"
@@ -426,10 +426,10 @@ seq_timeout(void *addr)
cv_broadcast(&sc->wchan);
selnotify(&sc->wsel, 0, NOTE_SUBMIT);
if ((pid = sc->async) != 0) {
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if ((p = proc_find(pid)) != NULL)
psignal(p, SIGIO);
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
}
mutex_exit(&sc->lock);
}
@@ -518,10 +518,10 @@ seq_input_event(struct sequencer_softc *sc, seq_event_t *cmd)
if (sc->async != 0) {
proc_t *p;
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if ((p = proc_find(sc->async)) != NULL)
psignal(p, SIGIO);
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
}
return 0;
}
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index ae2c9192076..072e201fcfb 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.113 2020/03/04 01:23:08 christos Exp $ */
+/* $NetBSD: uhid.c,v 1.114 2020/05/23 23:42:42 ad Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.113 2020/03/04 01:23:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.114 2020/05/23 23:42:42 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -301,10 +301,10 @@ uhid_softintr(void *cookie)
sc = cookie;
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if (sc->sc_async != NULL)
psignal(sc->sc_async, SIGIO);
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
}
static int
@@ -353,9 +353,9 @@ uhidopen(dev_t dev, int flag, int mode, struct lwp *l)
sc->sc_obuf = NULL;
sc->sc_state &= ~UHID_IMMED;
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
sc->sc_async = NULL;
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
return 0;
}
@@ -369,9 +369,9 @@ uhidclose(dev_t dev, int flag, int mode, struct lwp *l)
DPRINTF(("uhidclose: sc=%p\n", sc));
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
sc->sc_async = NULL;
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
mutex_enter(&sc->sc_access_lock);
@@ -561,45 +561,45 @@ uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, void *addr,
break;
case FIOASYNC:
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if (*(int *)addr) {
if (sc->sc_async != NULL) {
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
return EBUSY;
}
sc->sc_async = l->l_proc;
DPRINTF(("uhid_do_ioctl: FIOASYNC %p\n", l->l_proc));
} else
sc->sc_async = NULL;
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
break;
/* XXX this is not the most general solution. */
case TIOCSPGRP:
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if (sc->sc_async == NULL) {
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
return EINVAL;
}
if (*(int *)addr != sc->sc_async->p_pgid) {
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
return EPERM;
}
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
break;
case FIOSETOWN:
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if (sc->sc_async == NULL) {
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
return EINVAL;
}
if (-*(int *)addr != sc->sc_async->p_pgid
&& *(int *)addr != sc->sc_async->p_pid) {
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
return EPERM;
}
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
break;
case USB_HID_GET_RAW:
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 529df8717b5..be611a18994 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.183 2020/02/19 16:03:30 riastradh Exp $ */
+/* $NetBSD: usb.c,v 1.184 2020/05/23 23:42:42 ad Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.183 2020/02/19 16:03:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.184 2020/05/23 23:42:42 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -725,9 +725,9 @@ usbopen(dev_t dev, int flag, int mode, struct lwp *l)
if (usb_dev_open)
return EBUSY;
usb_dev_open = 1;
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
usb_async_proc = 0;
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
return 0;
}
@@ -805,9 +805,9 @@ usbclose(dev_t dev, int flag, int mode,
int unit = minor(dev);
if (unit == USB_DEV_MINOR) {
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
usb_async_proc = 0;
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
usb_dev_open = 0;
}
@@ -829,12 +829,12 @@ usbioctl(dev_t devt, u_long cmd, void *data, int flag, struct lwp *l)
return 0;
case FIOASYNC:
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if (*(int *)data)
usb_async_proc = l->l_proc;
else
usb_async_proc = 0;
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
return 0;
default:
@@ -1224,10 +1224,10 @@ usb_async_intr(void *cookie)
{
proc_t *proc;
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if ((proc = usb_async_proc) != NULL)
psignal(proc, SIGIO);
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
}
Static void
diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c
index c9cfd80ac21..b69bdc3934a 100644
--- a/sys/dev/wscons/wsdisplay_compat_usl.c
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_compat_usl.c,v 1.52 2018/12/15 22:05:23 christos Exp $ */
+/* $NetBSD: wsdisplay_compat_usl.c,v 1.53 2020/05/23 23:42:42 ad Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.52 2018/12/15 22:05:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.53 2020/05/23 23:42:42 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_freebsd.h"
@@ -142,15 +142,15 @@ static int
usl_sync_check_sig(struct usl_syncdata *sd, int sig, int flags)
{
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
if (sd->s_proc == proc_find(sd->s_pid)) {
sd->s_flags |= flags;
if (sig)
psignal(sd->s_proc, sig);
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
return 1;
}
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
printf("%s: process %d died\n", __func__, sd->s_pid);
usl_sync_done(sd);
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index dc18b1c6e9d..a3c34b1e363 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.44 2020/04/04 13:07:11 pgoyette Exp $ */
+/* $NetBSD: wsevent.c,v 1.45 2020/05/23 23:42:42 ad Exp $ */
/*-
* Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.44 2020/04/04 13:07:11 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.45 2020/05/23 23:42:42 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -387,9 +387,9 @@ wsevent_intr(void *cookie)
ev = cookie;
if (ev->async) {
- mutex_enter(proc_lock);
+ mutex_enter(&proc_lock);
psignal(ev->io, SIGIO);
- mutex_exit(proc_lock);
+ mutex_exit(&proc_lock);
}
}