PERFORCE change 150029 for review

[John Baldwin]

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

Change 150029 by jhb at jhb_mutex on 2008/09/18 17:23:22

	Drop some local diffs.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_rwlock.c#24 edit
.. //depot/projects/smpng/sys/kern/subr_witness.c#171 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_rwlock.c#24 (text+ko) ====

@@ -908,9 +908,6 @@
 #undef _rw_assert
 #endif
 
-/* XXX: no commit! */
-#define	panic	printf
-
 /*
  * In the non-WITNESS case, rw_assert() can only detect that at least
  * *some* thread owns an rlock, but it cannot guarantee that *this*

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

@@ -1009,9 +1009,6 @@
 	return (0);
 }
 
-/* XXX: no commit! */
-#define	panic	printf
-
 void
 witness_checkorder(struct lock_object *lock, int flags, const char *file,
     int line, struct lock_object *interlock)
@@ -2164,7 +2161,6 @@
 	else {
 		panic("Lock (%s) %s is not sleep or spin!",
 		    class->lc_name, lock->lo_name);
-		return;
 	}
 	file = fixup_filename(file);
 	switch (flags) {