Reversion of commit by Davidxu plus fixes since applied.

I'm not convinced there is anything major wrong with the patch but
them's the rules..

I am using my "David's mentor" hat to revert this as he's
offline for a while.

3 files changed, 5 insertions, 5 deletions

diff --git a/sys/ia64/ia64/interrupt.c b/sys/ia64/ia64/interrupt.c
index 30d4c37..720dbee 100644
--- a/sys/ia64/ia64/interrupt.c
+++ b/sys/ia64/ia64/interrupt.c
@@ -139,7 +139,7 @@ interrupt(u_int64_t vector, struct trapframe *framep)
 			mtx_lock_spin(&sched_lock);
 			hardclock_process(curthread, TRAPF_USERMODE(framep));
 			if ((schedclk2 & 0x7) == 0)
-				statclock_process(curthread, TRAPF_PC(framep),
+				statclock_process(curkse, TRAPF_PC(framep),
 				    TRAPF_USERMODE(framep));
 			mtx_unlock_spin(&sched_lock);
 		}
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index 1ce7d4e..d0e4aa6 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -331,7 +331,7 @@ trap(int vector, int imm, struct trapframe *framep)
 
 	user = ((framep->tf_cr_ipsr & IA64_PSR_CPL) == IA64_PSR_CPL_USER);
 	if (user) {
-		sticks = td->td_sticks;
+		sticks = td->td_kse->ke_sticks;
 		td->td_frame = framep;
 		if (td->td_ucred != p->p_ucred)
 			cred_update_thread(td);
@@ -792,7 +792,7 @@ syscall(int code, u_int64_t *args, struct trapframe *framep)
 	p = td->td_proc;
 
 	td->td_frame = framep;
-	sticks = td->td_sticks;
+	sticks = td->td_kse->ke_sticks;
 	if (td->td_ucred != p->p_ucred)
 		cred_update_thread(td);
 
@@ -939,7 +939,7 @@ ia32_syscall(struct trapframe *framep)
 	 */
 	cnt.v_syscall++;
 
-	sticks = td->td_sticks;
+	sticks = td->td_kse->ke_sticks;
 	td->td_frame = framep;
 	if (td->td_ucred != p->p_ucred) 
 		cred_update_thread(td);
diff --git a/sys/ia64/ia64/vm_machdep.c b/sys/ia64/ia64/vm_machdep.c
index 5c5fbff..63315f9 100644
--- a/sys/ia64/ia64/vm_machdep.c
+++ b/sys/ia64/ia64/vm_machdep.c
@@ -117,7 +117,7 @@ cpu_set_upcall(struct thread *td, void *pcb)
 }
 
 void
-cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku)
+cpu_set_upcall_kse(struct thread *td, struct kse *ke)
 {
 }