diff options
author | Nicholas Piggin <npiggin@gmail.com> | 2019-08-02 12:56:42 +0200 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-08-30 02:32:36 +0200 |
commit | c31f7134dc53f7020b3d49e846d1b950a761e324 (patch) | |
tree | aae8bf3aadca5ceed7ccd373e8ac162ea71870f1 /arch | |
parent | powerpc/64s/exception: machine check improve labels and comments (diff) | |
download | linux-c31f7134dc53f7020b3d49e846d1b950a761e324.tar.xz linux-c31f7134dc53f7020b3d49e846d1b950a761e324.zip |
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 <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190802105709.27696-18-npiggin@gmail.com
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index c2474c9c8d41..d44f6d103014 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 |