patch-2.1.19 linux/arch/sparc/kernel/rtrap.S
Next file: linux/arch/sparc/kernel/setup.c
Previous file: linux/arch/sparc/kernel/process.c
Back to the patch index
Back to the overall index
- Lines: 38
- Date:
Mon Dec 30 11:59:58 1996
- Orig file:
v2.1.18/linux/arch/sparc/kernel/rtrap.S
- Orig date:
Wed Dec 18 15:58:43 1996
diff -u --recursive --new-file v2.1.18/linux/arch/sparc/kernel/rtrap.S linux/arch/sparc/kernel/rtrap.S
@@ -1,4 +1,4 @@
-/* $Id: rtrap.S,v 1.40 1996/12/10 06:06:18 davem Exp $
+/* $Id: rtrap.S,v 1.41 1996/12/28 18:14:21 davem Exp $
* rtrap.S: Return from Sparc trap low-level code.
*
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -70,7 +70,6 @@
sethi %hi(C_LABEL(need_resched)), %twin_tmp1
wr %t_psr, 0x0, %psr
- WRITE_PAUSE
b ret_trap_kernel
nop
@@ -179,7 +178,6 @@
ld [%sp + REGWIN_SZ + PT_PSR], %o3
wr %t_wim, 0x0, %wim ! or else...
- WRITE_PAUSE
wr %t_psr, PSR_ET, %psr
WRITE_PAUSE
@@ -206,7 +204,6 @@
rtrap_patch5: and %g1, 0xff, %g1
wr %g1, 0x0, %wim
- WRITE_PAUSE
/* Grrr, make sure we load from the right %sp... */
LOAD_PT_ALL(sp, t_psr, t_pc, t_npc, g1)
@@ -232,7 +229,6 @@
ret_trap_user_stack_is_bolixed:
wr %t_wim, 0x0, %wim
- WRITE_PAUSE
wr %t_psr, PSR_ET, %psr
WRITE_PAUSE
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov