patch-2.4.3 linux/arch/sparc64/kernel/rtrap.S

Next file: linux/arch/sparc64/kernel/setup.c
Previous file: linux/arch/sparc64/kernel/ptrace.c
Back to the patch index
Back to the overall index

Lines: 15
Date: Sun Mar 25 18:14:21 2001
Orig file: v2.4.2/linux/arch/sparc64/kernel/rtrap.S
Orig date: Wed Aug 9 13:49:56 2000


diff -u --recursive --new-file v2.4.2/linux/arch/sparc64/kernel/rtrap.S linux/arch/sparc64/kernel/rtrap.S
@@ -1,4 +1,4 @@
-/* $Id: rtrap.S,v 1.53 2000/08/06 05:20:35 davem Exp $
+/* $Id: rtrap.S,v 1.54 2001/03/08 22:08:51 davem Exp $
  * rtrap.S: Preparing for return from trap on Sparc V9.
  *
  * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
@@ -192,7 +192,7 @@
 		rd			%fprs, %g5
 
 		wr			%g5, FPRS_FEF, %fprs
-		ldub			[%o1 + %o0], %g5
+		ldx			[%o1 + %o5], %g5
 		add			%g6, AOFF_task_thread + AOFF_thread_xfsr, %o1
 		membar			#StoreLoad | #LoadLoad
 		sll			%o0, 8, %o2

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi

TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)