openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/64s/exception: sreset move trampoline ahead of common code 

Follow convention and move tramp ahead of common.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Nicholas Piggin 2019-06-28 16:33:20 +10:00 committed by Michael Ellerman
parent 0e10be2bb9
commit acc8da4492
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/powerpc/kernel/exceptions-64s.S
View File

@ -884,6 +884,18 @@ TRAMP_REAL_BEGIN(system_reset_idle_wake)
BRANCH_TO_C000(r12, DOTSYM(idle_return_gpr_loss)) BRANCH_TO_C000(r12, DOTSYM(idle_return_gpr_loss))
#endif #endif
#ifdef CONFIG_PPC_PSERIES
/*
* Vectors for the FWNMI option. Share common code.
*/
TRAMP_REAL_BEGIN(system_reset_fwnmi)
/* See comment at system_reset exception, don't turn on RI */
EXCEPTION_PROLOG_0 PACA_EXNMI
EXCEPTION_PROLOG_1 EXC_STD, PACA_EXNMI, 0, 0x100, 0, 0, 0
EXCEPTION_PROLOG_2_REAL system_reset_common, EXC_STD, 0
#endif /* CONFIG_PPC_PSERIES */
EXC_COMMON_BEGIN(system_reset_common) EXC_COMMON_BEGIN(system_reset_common)
/* /*
* Increment paca->in_nmi then enable MSR_RI. SLB or MCE will be able * Increment paca->in_nmi then enable MSR_RI. SLB or MCE will be able
@ -941,18 +953,6 @@ EXC_COMMON_BEGIN(system_reset_common)
EXCEPTION_RESTORE_REGS EXC_STD EXCEPTION_RESTORE_REGS EXC_STD
RFI_TO_USER_OR_KERNEL RFI_TO_USER_OR_KERNEL
#ifdef CONFIG_PPC_PSERIES
/*
* Vectors for the FWNMI option. Share common code.
*/
TRAMP_REAL_BEGIN(system_reset_fwnmi)
/* See comment at system_reset exception, don't turn on RI */
EXCEPTION_PROLOG_0 PACA_EXNMI
EXCEPTION_PROLOG_1 EXC_STD, PACA_EXNMI, 0, 0x100, 0, 0, 0
EXCEPTION_PROLOG_2_REAL system_reset_common, EXC_STD, 0
#endif /* CONFIG_PPC_PSERIES */
EXC_REAL_BEGIN(machine_check, 0x200, 0x100) EXC_REAL_BEGIN(machine_check, 0x200, 0x100)
/* This is moved out of line as it can be patched by FW, but /* This is moved out of line as it can be patched by FW, but