From: Nicholas Piggin Date: Fri, 2 Aug 2019 10:56:42 +0000 (+1000) Subject: powerpc/64s/exception: Fix DAR load for handle_page_fault error case X-Git-Tag: v5.4-rc1~99^2~103 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c31f7134dc53f7020b3d49e846d1b950a761e324;p=thirdparty%2Fkernel%2Flinux.git powerpc/64s/exception: Fix DAR load for handle_page_fault error case This buglet goes back to before the 64/32 arch merge, but it does not seem to have had practical consequences because bad_page_fault does not use the 2nd argument, but rather regs->dar/nip. Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20190802105709.27696-18-npiggin@gmail.com --- diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index c2474c9c8d411..d44f6d1030141 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -2335,7 +2335,7 @@ handle_page_fault: bl save_nvgprs mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD - lwz r4,_DAR(r1) + ld r4,_DAR(r1) bl bad_page_fault b ret_from_except