Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acc8da44 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

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



Follow convention and move tramp ahead of common.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 0e10be2b

arch/powerpc/kernel/exceptions-64s.S

+12 −12
Original line number Diff line number Diff line
@@ -884,6 +884,18 @@ TRAMP_REAL_BEGIN(system_reset_idle_wake) 
	BRANCH_TO_C000(r12, DOTSYM(idle_return_gpr_loss))

#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)

	/*

	 * 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

	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)

	/* This is moved out of line as it can be patched by FW, but