tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'powerpc-6.7-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fix from Michael Ellerman:

- Fix stack teardown in ftrace_no_trace, seen as crashes doing CPU
hotplug while ftrace is active.

Thanks to Naveen N Rao.

* tag 'powerpc-6.7-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/ftrace: Fix stack teardown in ftrace_no_trace

Linus Torvalds c527f560 99d4cf76

options
unified split
Changed files
+2 -2
arch
powerpc
kernel
trace
ftrace_entry.S
+2 -2
arch/powerpc/kernel/trace/ftrace_entry.S
··· 62 62 .endif 63 63 64 64 /* Save previous stack pointer (r1) */ 65 - addi r8, r1, SWITCH_FRAME_SIZE 65 + addi r8, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE 66 66 PPC_STL r8, GPR1(r1) 67 67 68 68 .if \allregs == 1 ··· 182 182 mflr r3 183 183 mtctr r3 184 184 REST_GPR(3, r1) 185 - addi r1, r1, SWITCH_FRAME_SIZE 185 + addi r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE 186 186 mtlr r0 187 187 bctr 188 188 #endif