diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2021-03-12 15:50:30 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2021-03-29 05:22:06 +0300 |
| commit | 8f844c06f460687b028c675c3fa68f8e735aeb8c (patch) | |
| tree | 944a35df7a5afd5cd7eaa07868a9361c14ddc525 /arch/powerpc/kernel/head_book3s_32.S | |
| parent | dc13b889b586f499cc87eb2b0b7e901778b3b5cf (diff) | |
| download | linux-8f844c06f460687b028c675c3fa68f8e735aeb8c.tar.xz | |
powerpc/32: Provide a name to exception prolog continuation in virtual mode
Now that the prolog continuation is separated in .text, give it a name
and mark it _ASM_NOKPROBE_SYMBOL.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/d96374218815a6627e1e922ab2aba994050fb87a.1615552867.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc/kernel/head_book3s_32.S')
| -rw-r--r-- | arch/powerpc/kernel/head_book3s_32.S | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S index 4a74bbe7462b..4ff67c5cae1c 100644 --- a/arch/powerpc/kernel/head_book3s_32.S +++ b/arch/powerpc/kernel/head_book3s_32.S @@ -266,7 +266,7 @@ __secondary_hold_acknowledge: mfspr r1, SPRN_SPRG_SCRATCH2 #endif /* CONFIG_PPC_CHRP */ EXCEPTION_PROLOG_1 -7: EXCEPTION_PROLOG_2 +7: EXCEPTION_PROLOG_2 MachineCheck addi r3,r1,STACK_FRAME_OVERHEAD #ifdef CONFIG_PPC_CHRP beq cr1, 1f @@ -296,7 +296,7 @@ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_HPTE_TABLE) #endif 1: EXCEPTION_PROLOG_0 handle_dar_dsisr=1 EXCEPTION_PROLOG_1 - EXCEPTION_PROLOG_2 handle_dar_dsisr=1 + EXCEPTION_PROLOG_2 DataAccess handle_dar_dsisr=1 lwz r5, _DSISR(r11) andis. r0, r5, DSISR_DABRMATCH@h bne- 1f @@ -325,7 +325,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE) andi. r11, r11, MSR_PR EXCEPTION_PROLOG_1 - EXCEPTION_PROLOG_2 + EXCEPTION_PROLOG_2 InstructionAccess andis. r5,r9,DSISR_SRR1_MATCH_32S@h /* Filter relevant SRR1 bits */ stw r5, _DSISR(r11) stw r12, _DAR(r11) @@ -336,7 +336,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_HPTE_TABLE) /* Alignment exception */ START_EXCEPTION(0x600, Alignment) - EXCEPTION_PROLOG handle_dar_dsisr=1 + EXCEPTION_PROLOG Alignment handle_dar_dsisr=1 addi r3,r1,STACK_FRAME_OVERHEAD EXC_XFER_STD(0x600, alignment_exception) @@ -353,7 +353,7 @@ BEGIN_FTR_SECTION */ b ProgramCheck END_FTR_SECTION_IFSET(CPU_FTR_FPU_UNAVAILABLE) - EXCEPTION_PROLOG + EXCEPTION_PROLOG FPUnavailable beq 1f bl load_up_fpu /* if from user, just load it up */ b fast_exception_return @@ -716,7 +716,7 @@ fast_hash_page_return: __HEAD AltiVecUnavailable: - EXCEPTION_PROLOG + EXCEPTION_PROLOG AltiVecUnavailable #ifdef CONFIG_ALTIVEC beq 1f bl load_up_altivec /* if from user, just load it up */ @@ -727,7 +727,7 @@ AltiVecUnavailable: __HEAD PerformanceMonitor: - EXCEPTION_PROLOG + EXCEPTION_PROLOG PerformanceMonitor addi r3,r1,STACK_FRAME_OVERHEAD EXC_XFER_STD(0xf00, performance_monitor_exception) |