mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 20:53:53 +08:00
powerpc fixes for 5.11 #3
A fix for machine check handling with VMAP stack on 32-bit. A clang build fix. Thanks to: Christophe Leroy, Nathan Chancellor. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEJFGtCPCthwEv2Y/bUevqPMjhpYAFAl/69oATHG1wZUBlbGxl cm1hbi5pZC5hdQAKCRBR6+o8yOGlgDbGEACiL0a42LVtkjjqZy0SGlBRBtmz49Gg LpSCWnDF2qOzlzM8q0kimRlRR/A0fr+anWUUdyrIX14VICtew+XFBhHEhuF5/UR/ AFrU1OmRb+1NZo6hBUGDrRz7bk+jT6bIFyC/mxeMIZYZgIAmBmxE+f8s9szQiYXZ 8OdGWyAStnyMIqchiF4NbC/iSUnujlKePPFjfFZre3UAZ5jc9x4OJdhhu+5DbbVc 7v1BXK5QnQPJxfnqmkoPWg/P31B2MalpxexTuvnMG8HcAFqDTXTT8Z1SiMdIKTXn wA38xklJFRBMhf1SKrOdjWdKcU8dK2balmWygdf2+3Hkp231UV/LHXihiqjSouow s6ca/8L8fjJ33wR+uh0BsBi8eLB5OTYyZEyiQstrkCSZbKJfqOr9JT+aMr5f3LB6 Xfor8WFrBeQotYte8NFLL66oLquABFkOV8R3LZXB4RLsJB/ad78lUoJRWik1B8FZ dQejCPl0oqJ2Ay8B/gSOn7x42c+019Ef3ZpRYKYPZDSePo0sbctbtbTbGWVeNOGF x4vDc1Rs5H+bQCoGrWMSxEvbX5gGkQys81T+so4VBCCVBO3s4DxHYY7uu+MRd9UH hHFC3QFLwvxXM2VyowFC0Pd72jDAgflZxlUBYUU21Uh1cUJ5oTNdogMSxVb0uM23 hKZumrIFYm8yTg== =/ku0 -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
b3cd1a16cc
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user