[src/trunk]: src/sys/dev/isa stopgap fix to avoid panic due to recursive lock...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/31e5a7c16d26
branches:  trunk
changeset: 771621:31e5a7c16d26
user:      drochner <drochner%NetBSD.org@localhost>
date:      Sat Nov 26 15:54:51 2011 +0000

description:
stopgap fix to avoid panic due to recursive locking if the keyboard beep
is activated through a tty (which it usually is)
IMO it was no good idea to abuse tty_lock here - it is already
problematic in the tty subsystem

diffstat:

 sys/dev/isa/pcppi.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 2cdf926d5cb0 -r 31e5a7c16d26 sys/dev/isa/pcppi.c
--- a/sys/dev/isa/pcppi.c       Sat Nov 26 15:54:02 2011 +0000
+++ b/sys/dev/isa/pcppi.c       Sat Nov 26 15:54:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi.c,v 1.40 2011/11/25 22:40:02 riastradh Exp $ */
+/* $NetBSD: pcppi.c,v 1.41 2011/11/26 15:54:51 drochner Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.40 2011/11/25 22:40:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.41 2011/11/26 15:54:51 drochner Exp $");
 
 #include "attimer.h"
 
@@ -358,7 +358,7 @@
        /*
         * Comes in as ms, goes out at ticks; volume ignored.
         */
-       pcppi_bell(arg, pitch, (period * hz) / 1000,
+       pcppi_bell_locked(arg, pitch, (period * hz) / 1000,
            poll ? PCPPI_BELL_POLL : 0);
 }
 #endif /* NPCKBD > 0 */