PERFORCE change 61512 for review

[Julian Elischer]

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

Change 61512 by julian at julian_ref on 2004/09/14 22:48:19

	 fix small mismerge

Affected files ...

.. //depot/projects/nsched/sys/kern/kern_switch.c#28 edit

Differences ...

==== //depot/projects/nsched/sys/kern/kern_switch.c#28 (text+ko) ====

@@ -564,7 +564,7 @@
 	KASSERT ((ctd->td_kse != NULL && ctd->td_kse->ke_thread == ctd),
 	  ("thread has no (or wrong) sched-private part."));
 	KASSERT((td->td_inhibitors == 0),
-			("setrunqueue: trying to run inhibitted thread"));
+			("maybe_preempt: trying to run inhibitted thread"));
 	pri = td->td_priority;
 	cpri = ctd->td_priority;
 	if (pri >= cpri || cold /* || dumping */ || TD_IS_INHIBITED(ctd) ||