From owner-p4-projects@FreeBSD.ORG  Wed Aug 25 00:39:03 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BC01716A4D7; Wed, 25 Aug 2004 00:39:02 +0000 (GMT)
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 7FE8D16A4CF
	for <perforce@freebsd.org>; Wed, 25 Aug 2004 00:39:02 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 73F2A43D2D
	for <perforce@freebsd.org>; Wed, 25 Aug 2004 00:39:02 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7P0d2mH041590
	for <perforce@freebsd.org>; Wed, 25 Aug 2004 00:39:02 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7P0d2Te041587
	for perforce@freebsd.org; Wed, 25 Aug 2004 00:39:02 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 25 Aug 2004 00:39:02 GMT
Message-Id: <200408250039.i7P0d2Te041587@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 60383 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 25 Aug 2004 00:39:03 -0000

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

Change 60383 by jhb@jhb_slimer on 2004/08/25 00:38:37

	Revert some junk.

Affected files ...

.. //depot/projects/smpng/sys/i386/include/cpufunc.h#30 edit
.. //depot/projects/smpng/sys/kern/subr_witness.c#120 edit

Differences ...

==== //depot/projects/smpng/sys/i386/include/cpufunc.h#30 (text+ko) ====

@@ -85,12 +85,9 @@
 static __inline void
 do_cpuid(u_int ax, u_int *p)
 {
-
-	p[0] = ax;
-	__asm __volatile(
-	"cpuid"
-	: "+a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
-	);
+	__asm __volatile("cpuid"
+			 : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
+			 :  "0" (ax));
 }
 
 static __inline void

==== //depot/projects/smpng/sys/kern/subr_witness.c#120 (text+ko) ====

@@ -533,9 +533,6 @@
 witness_destroy(struct lock_object *lock)
 {
 	struct witness *w;
-#if 0
-	const char *name = NULL;
-#endif
 
 	if (witness_cold)
 		panic("lock (%s) %s destroyed while witness_cold",
@@ -550,20 +547,13 @@
 		mtx_lock_spin(&w_mtx);
 		MPASS(w->w_refcount > 0);
 		w->w_refcount--;
-#if 0
-		if (w->w_refcount == 0)
-			name = w->w_name;
-#endif
+
 		/*
 		 * Lock is already released if we have an allocation failure
 		 * and depart() fails.
 		 */
 		if (w->w_refcount != 0 || depart(w))
 			mtx_unlock_spin(&w_mtx);
-#if 0
-		if (name != NULL)
-			printf("dead witness: %s\n", w->w_name);
-#endif
 	}
 
 	mtx_lock(&all_mtx);