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

Merge tag 'powerpc-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:

 - A fix for machine check handling with VMAP stack on 32-bit.

 - A clang build fix.

Thanks to Christophe Leroy and Nathan Chancellor.

* tag 'powerpc-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: Handle .text.{hot,unlikely}.* in linker script
  powerpc/32s: Fix RTAS machine check with VMAP stack
parents a440e4d7 3ce47d95

arch/powerpc/kernel/head_book3s_32.S

+9 −0
Original line number Diff line number Diff line
@@ -260,10 +260,19 @@ __secondary_hold_acknowledge: 
MachineCheck:

	EXCEPTION_PROLOG_0

#ifdef CONFIG_PPC_CHRP

#ifdef CONFIG_VMAP_STACK

	mtspr	SPRN_SPRG_SCRATCH2,r1

	mfspr	r1, SPRN_SPRG_THREAD

	lwz	r1, RTAS_SP(r1)

	cmpwi	cr1, r1, 0

	bne	cr1, 7f

	mfspr	r1, SPRN_SPRG_SCRATCH2

#else

	mfspr	r11, SPRN_SPRG_THREAD

	lwz	r11, RTAS_SP(r11)

	cmpwi	cr1, r11, 0

	bne	cr1, 7f

#endif

#endif /* CONFIG_PPC_CHRP */

	EXCEPTION_PROLOG_1 for_rtas=1

7:	EXCEPTION_PROLOG_2

arch/powerpc/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ SECTIONS 
		ALIGN_FUNCTION();

#endif

		/* careful! __ftr_alt_* sections need to be close to .text */

		*(.text.hot TEXT_MAIN .text.fixup .text.unlikely .fixup __ftr_alt_* .ref.text);

		*(.text.hot .text.hot.* TEXT_MAIN .text.fixup .text.unlikely .text.unlikely.* .fixup __ftr_alt_* .ref.text);

#ifdef CONFIG_PPC64

		*(.tramp.ftrace.text);

#endif