Module Name: src
Committed By: drochner
Date: Sat Nov 26 15:54:52 UTC 2011
Modified Files:
src/sys/dev/isa: pcppi.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/isa/pcppi.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/isa/pcppi.c
diff -u src/sys/dev/isa/pcppi.c:1.40 src/sys/dev/isa/pcppi.c:1.41
--- src/sys/dev/isa/pcppi.c:1.40 Fri Nov 25 22:40:02 2011
+++ src/sys/dev/isa/pcppi.c Sat Nov 26 15:54:51 2011
@@ -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 @@ pcppi_pckbd_bell(void *arg, u_int pitch,
/*
* 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 */
