Commit 5c57dda8 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc64: si_addr fix

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

This patch fixes si_addr on some segfaults in 64 bits mode, it used to be
bogus (address not passed to do_page_fault by the asm code after a failure
to set an SLB entry).
parent dbf5a5af
......@@ -767,6 +767,7 @@ DataAccessSLB_common:
beq fast_exception_return /* Return if we succeeded */
addi r3,r1,STACK_FRAME_OVERHEAD
DO_COPY_EE()
ld r4,_DAR(r1)
li r6,0x380
li r5,0
bl .save_remaining_regs
......@@ -810,6 +811,7 @@ InstructionAccessSLB_common:
addi r3,r1,STACK_FRAME_OVERHEAD
DO_COPY_EE()
mr r4,r22 /* SRR0 = NIA */
li r6,0x480
li r5,0
bl .save_remaining_regs
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment