Commit c527f560 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 99d4cf76 4b3338aa

arch/powerpc/kernel/trace/ftrace_entry.S

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
	.endif



	/* Save previous stack pointer (r1) */

	addi	r8, r1, SWITCH_FRAME_SIZE

	addi	r8, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE

	PPC_STL	r8, GPR1(r1)



	.if \allregs == 1
@@ -182,7 +182,7 @@ ftrace_no_trace: 
	mflr	r3

	mtctr	r3

	REST_GPR(3, r1)

	addi	r1, r1, SWITCH_FRAME_SIZE

	addi	r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE

	mtlr	r0

	bctr

#endif