Commit 92b4fc75 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'powerpc-4.11-8' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:
 "Just two fixes.

  The first fixes kprobing a stdu, and is marked for stable as it's been
  broken for ~ever. In hindsight this could have gone in next.

  The other is a fix for a change we merged this cycle, where if we take
  a certain exception when the kernel is running relocated (currently
  only used for kdump), we checkstop the box.

  Thanks to Ravi Bangoria"

* tag 'powerpc-4.11-8' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y
  powerpc/kprobe: Fix oops when kprobed on 'stdu' instruction
parents fe7ba289 be5c5e84
...@@ -236,9 +236,9 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) ...@@ -236,9 +236,9 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
mtctr reg; \ mtctr reg; \
bctr bctr
#define BRANCH_LINK_TO_FAR(reg, label) \ #define BRANCH_LINK_TO_FAR(label) \
__LOAD_FAR_HANDLER(reg, label); \ __LOAD_FAR_HANDLER(r12, label); \
mtctr reg; \ mtctr r12; \
bctrl bctrl
/* /*
...@@ -265,7 +265,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) ...@@ -265,7 +265,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
#define BRANCH_TO_COMMON(reg, label) \ #define BRANCH_TO_COMMON(reg, label) \
b label b label
#define BRANCH_LINK_TO_FAR(reg, label) \ #define BRANCH_LINK_TO_FAR(label) \
bl label bl label
#define BRANCH_TO_KVM(reg, label) \ #define BRANCH_TO_KVM(reg, label) \
......
...@@ -689,7 +689,7 @@ resume_kernel: ...@@ -689,7 +689,7 @@ resume_kernel:
addi r8,r1,INT_FRAME_SIZE /* Get the kprobed function entry */ addi r8,r1,INT_FRAME_SIZE /* Get the kprobed function entry */
lwz r3,GPR1(r1) ld r3,GPR1(r1)
subi r3,r3,INT_FRAME_SIZE /* dst: Allocate a trampoline exception frame */ subi r3,r3,INT_FRAME_SIZE /* dst: Allocate a trampoline exception frame */
mr r4,r1 /* src: current exception frame */ mr r4,r1 /* src: current exception frame */
mr r1,r3 /* Reroute the trampoline frame to r1 */ mr r1,r3 /* Reroute the trampoline frame to r1 */
...@@ -703,8 +703,8 @@ resume_kernel: ...@@ -703,8 +703,8 @@ resume_kernel:
addi r6,r6,8 addi r6,r6,8
bdnz 2b bdnz 2b
/* Do real store operation to complete stwu */ /* Do real store operation to complete stdu */
lwz r5,GPR1(r1) ld r5,GPR1(r1)
std r8,0(r5) std r8,0(r5)
/* Clear _TIF_EMULATE_STACK_STORE flag */ /* Clear _TIF_EMULATE_STACK_STORE flag */
......
...@@ -982,7 +982,7 @@ TRAMP_REAL_BEGIN(hmi_exception_early) ...@@ -982,7 +982,7 @@ TRAMP_REAL_BEGIN(hmi_exception_early)
EXCEPTION_PROLOG_COMMON_2(PACA_EXGEN) EXCEPTION_PROLOG_COMMON_2(PACA_EXGEN)
EXCEPTION_PROLOG_COMMON_3(0xe60) EXCEPTION_PROLOG_COMMON_3(0xe60)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
BRANCH_LINK_TO_FAR(r4, hmi_exception_realmode) BRANCH_LINK_TO_FAR(hmi_exception_realmode) /* Function call ABI */
/* Windup the stack. */ /* Windup the stack. */
/* Move original HSRR0 and HSRR1 into the respective regs */ /* Move original HSRR0 and HSRR1 into the respective regs */
ld r9,_MSR(r1) ld r9,_MSR(r1)
......
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