From owner-p4-projects@FreeBSD.ORG  Sat Oct  7 09:26:47 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B517E16A416; Sat,  7 Oct 2006 09:26:47 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8B5C816A40F
	for <perforce@FreeBSD.org>; Sat,  7 Oct 2006 09:26:47 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5653943D53
	for <perforce@FreeBSD.org>; Sat,  7 Oct 2006 09:26:47 +0000 (GMT)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k979QlGm034586
	for <perforce@FreeBSD.org>; Sat, 7 Oct 2006 09:26:47 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k979Qkau034574
	for perforce@freebsd.org; Sat, 7 Oct 2006 09:26:46 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 7 Oct 2006 09:26:46 GMT
Message-Id: <200610070926.k979Qkau034574@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 107405 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Oct 2006 09:26:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=107405

Change 107405 by hselasky@hselasky_mini_itx on 2006/10/07 09:26:28

	Temporary workarounds to prevent the evident panic, when
	the keyboard layer is being called without Giant.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#12 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#12 (text+ko) ====

@@ -869,6 +869,10 @@
 {
 	struct ukbd_softc *sc = kbd->kb_data;
 
+	if (!mtx_owned(&Giant)) {
+	    return 0; /* XXX */
+	}
+
 	mtx_assert(&Giant, MA_OWNED);
 
 	if (!KBD_IS_ACTIVE(kbd)) {
@@ -891,6 +895,10 @@
 {
 	struct ukbd_softc *sc = kbd->kb_data;
 
+	if (!mtx_owned(&Giant)) {
+	    return 0; /* XXX */
+	}
+
 	mtx_assert(&Giant, MA_OWNED);
 
 	if (!KBD_IS_ACTIVE(kbd)) {
@@ -915,6 +923,10 @@
 	u_int32_t scancode;
 #endif
 
+	if (!mtx_owned(&Giant)) {
+	    return -1; /* XXX */
+	}
+
 	mtx_assert(&Giant, MA_OWNED);
 
 #ifdef UKBD_EMULATE_ATSCANCODE
@@ -961,6 +973,9 @@
 #ifdef UKBD_EMULATE_ATSCANCODE
 	u_int32_t scancode;
 #endif
+	if (!mtx_owned(&Giant)) {
+	    return NOKEY; /* XXX */
+	}
 
 	mtx_assert(&Giant, MA_OWNED);
 
@@ -1272,6 +1287,10 @@
 {
 	struct ukbd_softc *sc = kbd->kb_data;
 
+	if (!mtx_owned(&Giant)) {
+	    return; /* XXX */
+	}
+
 	mtx_assert(&Giant, MA_OWNED);
 
 	sc->sc_flags &= ~(UKBD_FLAG_COMPOSE|UKBD_FLAG_POLLING);
@@ -1310,6 +1329,10 @@
 {
 	struct ukbd_softc *sc = kbd->kb_data;
 
+	if (!mtx_owned(&Giant)) {
+	    return 0; /* XXX */
+	}
+
 	mtx_assert(&Giant, MA_OWNED);
 
 	if (on) {