Commit 9bc657b2 authored by David S. Miller's avatar David S. Miller Committed by David S. Miller
Browse files

[SPARC64]: Fix too early reference to %g6 



%g6 is not necessarily set to current_thread_info()
at sparc64_realfault_common.  So store the fault
code and address after we invoke etrap and %g6 is
properly set up.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 764afe2e

arch/sparc64/kernel/tsb.S

+5 −2
Original line number Diff line number Diff line
@@ -110,10 +110,13 @@ tsb_do_itlb_fault: 


	.globl	sparc64_realfault_common

sparc64_realfault_common:

	stb	%g4, [%g6 + TI_FAULT_CODE]	! Save fault code

	stx	%g5, [%g6 + TI_FAULT_ADDR]	! Save fault address

	/* fault code in %g4, fault address in %g5, etrap will

	 * preserve these two values in %l4 and %l5 respectively

	 */

	ba,pt	%xcc, etrap			! Save trap state

1:	 rd	%pc, %g7			! ...

	stb	%l4, [%g6 + TI_FAULT_CODE]	! Save fault code

	stx	%l5, [%g6 + TI_FAULT_ADDR]	! Save fault address

	call	do_sparc64_fault		! Call fault handler

	 add	%sp, PTREGS_OFF, %o0		! Compute pt_regs arg

	ba,pt	%xcc, rtrap_clr_l6		! Restore cpu state