PERFORCE change 61065 for review

[Julian Elischer]

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

Change 61065 by julian at julian_ref on 2004/09/05 22:31:50

	fix mismerges

Affected files ...

.. //depot/projects/nsched/sys/i386/i386/mp_machdep.c#8 edit
.. //depot/projects/nsched/sys/kern/kern_synch.c#11 edit
.. //depot/projects/nsched/sys/kern/sched_4bsd.c#37 edit
.. //depot/projects/nsched/sys/sys/proc.h#26 edit

Differences ...

==== //depot/projects/nsched/sys/i386/i386/mp_machdep.c#8 (text+ko) ====

@@ -555,7 +555,7 @@
 	binuptime(PCPU_PTR(switchtime));
 	PCPU_SET(switchticks, ticks);
 
-	cpu_throw(NULL, choosethread(SW_VOL));	/* doesn't return */
+	cpu_throw(NULL, choosethread());	/* doesn't return */
 
 	panic("scheduler returned us to %s", __func__);
 	/* NOTREACHED */

==== //depot/projects/nsched/sys/kern/kern_synch.c#11 (text+ko) ====

@@ -337,7 +337,7 @@
 	    (void *)td, td->td_sched, (long)p->p_pid, p->p_comm);
 	if (td->td_proc->p_flag & P_SA)
 		newtd = thread_switchout(td, flags, newtd);
-	sched_switch(td, flags, newtd);
+	sched_switch(td, newtd);
 
 	CTR4(KTR_PROC, "mi_switch: new thread %p (kse %p, pid %ld, %s)",
 	    (void *)td, td->td_sched, (long)p->p_pid, p->p_comm);

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

@@ -432,20 +432,20 @@
 				 * stop recalculating its priority until
 				 * it wakes up.
 				 */
-				if (ke->ke_sched->ske_cpticks == 0)
+				if (ke->ke_cpticks == 0)
 					continue;
 #if	(FSHIFT >= CCPU_SHIFT)
 				ke->ke_pctcpu += (realstathz == 100)
-				    ? ((fixpt_t) ke->ke_sched->ske_cpticks) <<
+				    ? ((fixpt_t) ke->ke_cpticks) <<
 				    (FSHIFT - CCPU_SHIFT) :
-				    100 * (((fixpt_t) ke->ke_sched->ske_cpticks)
+				    100 * (((fixpt_t) ke->ke_cpticks)
 				    << (FSHIFT - CCPU_SHIFT)) / realstathz;
 #else
 				ke->ke_pctcpu += ((FSCALE - ccpu) *
-				    (ke->ke_sched->ske_cpticks *
+				    (ke->ke_cpticks *
 				    FSCALE / realstathz)) >> FSHIFT;
 #endif
-				ke->ke_sched->ske_cpticks = 0;
+				ke->ke_cpticks = 0;
 			} /* end of kse loop */
 			/* 
 			 * If there are ANY running threads in this KSEGRP,
@@ -627,7 +627,7 @@
 	kg = td->td_ksegrp;
 	ke = td->td_kse;
 
-	ke->ke_sched->ske_cpticks++;
+	ke->ke_cpticks++;
 	kg->kg_estcpu = ESTCPULIM(kg->kg_estcpu + 1);
 	if ((kg->kg_estcpu % INVERSE_ESTCPU_WEIGHT) == 0) {
 		resetpriority(kg);
@@ -997,7 +997,7 @@
 
 	if ((td->td_proc->p_flag & P_NOLOAD) == 0)
 		sched_tdcnt--;
-	runq_remove(ke->ke_sched->ske_runq, ke);
+	runq_remove(ke->ke_runq, ke);
 
 	ke->ke_state = KES_THREAD;
 	ke->ke_ksegrp->kg_runq_kses--;

==== //depot/projects/nsched/sys/sys/proc.h#26 (text+ko) ====

@@ -320,7 +320,6 @@
 	vm_offset_t	td_altkstack;	/* (a) Kernel VA of alternate kstack. */
 	int		td_altkstack_pages; /* (a) Size of the alt kstack */
 	u_int		td_critnest;	/* (k) Critical section nest level. */
-	struct kse	*td_kse;	/* (j) Current KSE if any. */
 	struct mdthread td_md;		/* (k) Any machine-dependent fields. */
 	struct td_sched	*td_sched;	/* (*) Scheduler-specific data. */
 };