patch-2.1.29 linux/arch/sparc/kernel/etrap.S

• Lines: 51
• Date: Wed Mar 5 17:04:30 1997
• Orig file: v2.1.28/linux/arch/sparc/kernel/etrap.S
• Orig date: Fri Dec 13 01:37:30 1996

diff -u --recursive --new-file v2.1.28/linux/arch/sparc/kernel/etrap.S linux/arch/sparc/kernel/etrap.S
@@ -1,4 +1,4 @@
-/* $Id: etrap.S,v 1.22 1996/12/03 08:44:33 jj Exp $
+/* $Id: etrap.S,v 1.23 1997/03/04 16:26:25 jj Exp $
  * etrap.S: Sparc trap window preparation for entry into the
  *          Linux kernel.
  *
@@ -100,7 +100,7 @@
 	 mov	%t_kstack, %sp		! jump onto new stack
 
 trap_setup_kernel_spill:
-	ld	[%curptr + THREAD_UMASK], %g1
+	ld	[%curptr + AOFF_task_tss + AOFF_thread_uwinmask], %g1
 	orcc	%g0, %g1, %g0
 	bne	trap_setup_user_spill	! there are some user windows, yuck
 	/* Spill from kernel, but only kernel windows, adjust
@@ -130,7 +130,7 @@
 	/* We can't use %curptr yet. */
 	LOAD_CURRENT(t_kstack, t_twinmask)
 	mov	1, %t_twinmask
-	ld	[%t_kstack + TASK_SAVED_KSTACK], %t_kstack
+	ld	[%t_kstack + AOFF_task_saved_kernel_stack], %t_kstack
 	sll	%t_twinmask, %t_psr, %t_twinmask ! t_twinmask = (1 << psr)
 
 	/* Build pt_regs frame. */
@@ -138,7 +138,7 @@
 
 	/* Clear current->tss.w_saved */
 	LOAD_CURRENT(curptr, g1)
-	st	%g0, [%curptr + THREAD_W_SAVED]
+	st	%g0, [%curptr + AOFF_task_tss + AOFF_thread_w_saved]
 
 	/* See if we are in the trap window. */
 	andcc	%t_twinmask, %t_wim, %g0
@@ -169,7 +169,7 @@
 	andn	%g2, %t_twinmask, %g2
 tsetup_patch3:
 	and	%g2, 0xff, %g2			! patched on 7win Sparcs
-	st	%g2, [%curptr + THREAD_UMASK]	! store new umask
+	st	%g2, [%curptr + AOFF_task_tss + AOFF_thread_uwinmask]	! store new umask
 
 	jmpl	%t_retpc + 0x8, %g0		! return to caller
 	 mov	%t_kstack, %sp			! and onto kernel stack
@@ -190,7 +190,7 @@
 tsetup_patch6:
 	and	%g2, 0xff, %g2		! patched on 7win Sparcs
 	andn	%g1, %g2, %g1		! clear this bit in %g1
-	st	%g1, [%curptr + THREAD_UMASK]
+	st	%g1, [%curptr + AOFF_task_tss + AOFF_thread_uwinmask]
 
 	save	%g0, %g0, %g0