PERFORCE change 56601 for review

[Julian Elischer]

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

Change 56601 by julian at julian_jules1 on 2004/07/06 07:58:17

	 try catch up with jhb

Affected files ...

.. //depot/projects/nsched/sys/kern/sched_4bsd.c#25 edit
.. //depot/projects/nsched/sys/kern/sched_ule.c#13 edit

Differences ...

==== //depot/projects/nsched/sys/kern/sched_4bsd.c#25 (text+ko) ====

@@ -1007,7 +1007,8 @@
 	KASSERT(td->td_proc->p_sflag & PS_INMEM,
 	    ("sched_add: process swapped out"));
 
-#ifdef SMP
+#if 0
+#ifdef SMP 
 	/*
 	 * Only try to preempt if the thread is unpinned or pinned to the
 	 * current CPU.
@@ -1016,6 +1017,7 @@
 #endif
 	if (maybe_preempt(td))
 		return;
+#endif
 	td->td_ksegrp->kg_runq_threads++;
 	std->std_state = STDS_ONRUNQ;
 
@@ -1889,7 +1891,7 @@
 	pri = td->td_priority;
 	cpri = ctd->td_priority;
 	if (pri >= cpri || cold /* || dumping */ || TD_IS_INHIBITED(ctd) ||
-	    td->td_td_sched->std_state != STDS_THREAD)
+	    td->td_sched->std_state != STDS_THREAD)
 		return (0);
 #ifndef FULL_PREEMPTION
 	if (!(pri >= PRI_MIN_ITHD && pri <= PRI_MAX_ITHD) &&

==== //depot/projects/nsched/sys/kern/sched_ule.c#13 (text+ko) ====