diff options
| author | julian <julian@FreeBSD.org> | 2003-02-01 12:17:09 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 2003-02-01 12:17:09 +0000 |
| commit | e8efa7328e487806fb77d3ec54bf5fa5f8b017ed (patch) | |
| tree | 5ab8f2c0a0aaeb3da3779201a31e710dee48d388 /sys/alpha | |
| parent | 1c5753d03f1205c6e2831f320c4007946a4b050f (diff) | |
| download | FreeBSD-src-e8efa7328e487806fb77d3ec54bf5fa5f8b017ed.zip FreeBSD-src-e8efa7328e487806fb77d3ec54bf5fa5f8b017ed.tar.gz | |
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.
Diffstat (limited to 'sys/alpha')
| -rw-r--r-- | sys/alpha/alpha/interrupt.c | 2 | ||||
| -rw-r--r-- | sys/alpha/alpha/trap.c | 4 | ||||
| -rw-r--r-- | sys/alpha/alpha/vm_machdep.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c index 731f8cf..19cd144 100644 --- a/sys/alpha/alpha/interrupt.c +++ b/sys/alpha/alpha/interrupt.c @@ -479,7 +479,7 @@ alpha_clock_interrupt(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/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c index e1e8f99..6c554f7 100644 --- a/sys/alpha/alpha/trap.c +++ b/sys/alpha/alpha/trap.c @@ -296,7 +296,7 @@ trap(a0, a1, a2, entry, framep) CTR5(KTR_TRAP, "%s trap: pid %d, (%lx, %lx, %lx)", user ? "user" : "kernel", p->p_pid, a0, a1, a2); 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); @@ -666,7 +666,7 @@ syscall(code, framep) cnt.v_syscall++; td->td_frame = framep; opc = framep->tf_regs[FRAME_PC] - 4; - sticks = td->td_sticks; + sticks = td->td_kse->ke_sticks; if (td->td_ucred != p->p_ucred) cred_update_thread(td); if (p->p_flag & P_KSES) diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c index 73f2343..8daa26f 100644 --- a/sys/alpha/alpha/vm_machdep.c +++ b/sys/alpha/alpha/vm_machdep.c @@ -309,7 +309,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) { /* XXX */ |
