From owner-p4-projects@FreeBSD.ORG  Fri Jul 21 16:17:52 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 0EE4816A4E8; Fri, 21 Jul 2006 16:17:52 +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 DF91816A4E6
	for <perforce@freebsd.org>; Fri, 21 Jul 2006 16:17:51 +0000 (UTC)
	(envelope-from ssouhlal@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AA64743D60
	for <perforce@freebsd.org>; Fri, 21 Jul 2006 16:17:51 +0000 (GMT)
	(envelope-from ssouhlal@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 k6LGHpQo074892
	for <perforce@freebsd.org>; Fri, 21 Jul 2006 16:17:51 GMT
	(envelope-from ssouhlal@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6LGHpA9074889
	for perforce@freebsd.org; Fri, 21 Jul 2006 16:17:51 GMT
	(envelope-from ssouhlal@freebsd.org)
Date: Fri, 21 Jul 2006 16:17:51 GMT
Message-Id: <200607211617.k6LGHpA9074889@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ssouhlal@freebsd.org using -f
From: Suleiman Souhlal <ssouhlal@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 102058 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: Fri, 21 Jul 2006 16:17:52 -0000

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

Change 102058 by ssouhlal@ssouhlal-maho on 2006/07/21 16:17:11

	Implement spinlock_enter() and spinlock_exit().
	This makes a MALTA kernel with INVARIANTS and WITNESS go to the
	"mountroot>" prompt without panicking.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/machdep.c#18 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/machdep.c#18 (text+ko) ====

@@ -284,13 +284,25 @@
 void
 spinlock_enter(void)
 {
+	struct thread *td;
 
+	td = curthread;
+	if (td->td_md.md_spinlock_count == 0)
+		td->td_md.md_saved_sr = intr_disable();
+	td->td_md.md_spinlock_count++;
+	critical_enter();
 }
 
 void
 spinlock_exit(void)
 {
+	struct thread *td;
 
+	td = curthread;
+	critical_exit();
+	td->td_md.md_spinlock_count--;
+	if (td->td_md.md_spinlock_count == 0)
+		intr_restore(td->td_md.md_saved_sr);
 }
 
 void