diff options
Diffstat (limited to 'arch/sparc/kernel/entry.S')
| -rw-r--r-- | arch/sparc/kernel/entry.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index ff1ac2497..0f1d1122e 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S @@ -1,4 +1,4 @@ -/* $Id: entry.S,v 1.160 1999/06/03 15:02:11 davem Exp $ +/* $Id: entry.S,v 1.161 1999/08/14 03:51:05 anton Exp $ * arch/sparc/kernel/entry.S: Sparc trap low-level entry points. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -1397,7 +1397,7 @@ flush_patch_two: rd %wim, %g5 WRITE_PAUSE mov %fp, %o1 ! arg1: usp - std %g4, [%curptr + AOFF_task_tss + AOFF_thread_fork_kpsr] + std %g4, [%curptr + AOFF_task_thread + AOFF_thread_fork_kpsr] add %sp, REGWIN_SZ, %o2 ! arg2: pt_regs ptr call C_LABEL(do_fork) mov %l5, %o7 @@ -1419,7 +1419,7 @@ flush_patch_three: mov %fp, %o1 ! yes, use callers usp andn %o1, 7, %o1 ! no, align to 8 bytes 1: - std %g4, [%curptr + AOFF_task_tss + AOFF_thread_fork_kpsr] + std %g4, [%curptr + AOFF_task_thread + AOFF_thread_fork_kpsr] add %sp, REGWIN_SZ, %o2 ! arg2: pt_regs ptr call C_LABEL(do_fork) mov %l5, %o7 @@ -1433,7 +1433,7 @@ flush_patch_four: WRITE_PAUSE rd %wim, %g5 WRITE_PAUSE - std %g4, [%curptr + AOFF_task_tss + AOFF_thread_fork_kpsr] + std %g4, [%curptr + AOFF_task_thread + AOFF_thread_fork_kpsr] sethi %hi(0x4000 | 0x0100 | SIGCHLD), %o0 mov %fp, %o1 or %o0, %lo(0x4000 | 0x0100 | SIGCHLD), %o0 @@ -1854,7 +1854,7 @@ kuw_patch1_7win: sll %o3, 6, %o3 * traps with the old method of just doing flush_user_windows(). */ C_LABEL(kill_user_windows): - ld [%g6 + AOFF_task_tss + AOFF_thread_uwinmask], %o0 ! get current umask + ld [%g6 + AOFF_task_thread + AOFF_thread_uwinmask], %o0 ! get current umask orcc %g0, %o0, %g0 ! if no bits set, we are done be 3f ! nothing to do rd %psr, %o5 ! must clear interrupts @@ -1862,7 +1862,7 @@ C_LABEL(kill_user_windows): wr %o4, 0x0, %psr ! the uwinmask state WRITE_PAUSE ! burn them cycles 1: - ld [%g6 + AOFF_task_tss + AOFF_thread_uwinmask], %o0 ! get consistant state + ld [%g6 + AOFF_task_thread + AOFF_thread_uwinmask], %o0 ! get consistant state orcc %g0, %o0, %g0 ! did an interrupt come in? be 4f ! yep, we are done rd %wim, %o3 ! get current wim @@ -1874,13 +1874,13 @@ kuw_patch1: bne kuw_patch1 ! not done yet srl %o3, 1, %o4 ! begin another save simulation wr %o3, 0x0, %wim ! set the new wim - st %g0, [%g6 + AOFF_task_tss + AOFF_thread_uwinmask] ! clear uwinmask + st %g0, [%g6 + AOFF_task_thread + AOFF_thread_uwinmask] ! clear uwinmask 4: wr %o5, 0x0, %psr ! re-enable interrupts WRITE_PAUSE ! burn baby burn 3: retl ! return - st %g0, [%g6 + AOFF_task_tss + AOFF_thread_w_saved] ! no windows saved + st %g0, [%g6 + AOFF_task_thread + AOFF_thread_w_saved] ! no windows saved .align 4 .globl C_LABEL(restore_current) |