Merge tag 'powerpc-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / arch / powerpc / kernel / head_32.h

diff --git a/arch/powerpc/kernel/head_32.h b/arch/powerpc/kernel/head_32.h
index 349c4a8..c328626 100644 (file)
--- a/arch/powerpc/kernel/head_32.h
+++ b/arch/powerpc/kernel/head_32.h
@@ -115,8 +115,7 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt)
        stw     r10,8(r1)
        li      r10, \trapno
        stw     r10,_TRAP(r1)
-       SAVE_4GPRS(3, r1)
-       SAVE_2GPRS(7, r1)
+       SAVE_GPRS(3, 8, r1)
        SAVE_NVGPRS(r1)
        stw     r2,GPR2(r1)
        stw     r12,_NIP(r1)
@@ -136,6 +135,12 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt)
        andi.   r12,r9,MSR_PR
        bne     777f
        bl      prepare_transfer_to_handler
+#ifdef CONFIG_PPC_KUEP
+       b       778f
+777:
+       bl      __kuep_lock
+778:
+#endif
 777:
 #endif
 .endm