Module Name: src
Committed By: mrg
Date: Fri Dec 9 08:56:55 UTC 2011
Modified Files:
src/sys/dev/acpi: mpu_acpi.c
Log Message:
provide a lock for mpu_attach.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/acpi/mpu_acpi.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/acpi/mpu_acpi.c
diff -u src/sys/dev/acpi/mpu_acpi.c:1.12 src/sys/dev/acpi/mpu_acpi.c:1.13
--- src/sys/dev/acpi/mpu_acpi.c:1.12 Thu Nov 24 03:35:57 2011
+++ src/sys/dev/acpi/mpu_acpi.c Fri Dec 9 08:56:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_acpi.c,v 1.12 2011/11/24 03:35:57 mrg Exp $ */
+/* $NetBSD: mpu_acpi.c,v 1.13 2011/12/09 08:56:54 mrg Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.12 2011/11/24 03:35:57 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.13 2011/12/09 08:56:54 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -47,6 +47,7 @@ static void mpu_acpi_attach(device_t, de
struct mpu_acpi_softc {
struct mpu_softc sc_mpu;
+ kmutex_t sc_lock;
};
CFATTACH_DECL_NEW(mpu_acpi, sizeof(struct mpu_acpi_softc), mpu_acpi_match,
@@ -118,6 +119,8 @@ mpu_acpi_attach(device_t parent, device_
sc->model = "Roland MPU-401 MIDI UART";
sc->sc_dev = self;
+ sc->lock = &asc->sc_lock;
+ mutex_init(&asc->sc_lock, MUTEX_DEFAULT, IPL_AUDIO);
mpu_attach(sc);
sc->arg = isa_intr_establish(aa->aa_ic, irq->ar_irq,
