PERFORCE change 60383 for review

[John Baldwin]

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

Change 60383 by jhb at 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);