8368 remove warlock leftovers from usr/src/uts

@@ -22,12 +22,10 @@
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident   "%Z%%M% %I%     %E% SMI"
-
 /*
  * s1394_dev_disc.c
  *    1394 Services Layer Device Discovery Routines
  *    This file contains the bus reset thread code, bus manager routines and
  *    various routines that are used to implement remote Config ROM reading.

@@ -481,13 +479,11 @@
 {
         ASSERT(MUTEX_HELD(&hal->br_thread_mutex));
         ASSERT(MUTEX_NOT_HELD(&hal->topology_tree_mutex));
         TNF_PROBE_0(s1394_br_thread_exit_enter, S1394_TNF_SL_HOTPLUG_STACK, "");
         s1394_flush_cmplq(hal);
-#ifndef __lock_lint
         CALLB_CPR_EXIT(&hal->hal_cprinfo);
-#endif
         hal->br_thread_ev_type &= ~BR_THR_GO_AWAY;
         thread_exit();
         /*NOTREACHED*/
         TNF_PROBE_0(s1394_br_thread_exit_enter, S1394_TNF_SL_HOTPLUG_STACK, "");
 }