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

Commit 6adc6e9c authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/64s: Drop _MASKABLE_RELON_EXCEPTION_PSERIES() 



_MASKABLE_RELON_EXCEPTION_PSERIES() does nothing useful, update all
callers to use __MASKABLE_RELON_EXCEPTION_PSERIES() directly.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 9bf2877a

arch/powerpc/include/asm/exception-64s.h

+4 −7
Original line number Diff line number Diff line
@@ -651,11 +651,8 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) 
	MASKABLE_EXCEPTION_PROLOG_1(PACA_EXGEN, extra, vec, bitmask);	\

	EXCEPTION_PROLOG_2_RELON(label, h)



#define _MASKABLE_RELON_EXCEPTION_PSERIES(vec, label, h, extra, bitmask)\

	__MASKABLE_RELON_EXCEPTION_PSERIES(vec, label, h, extra, bitmask)



#define MASKABLE_RELON_EXCEPTION_PSERIES(loc, vec, label, bitmask)	\

	_MASKABLE_RELON_EXCEPTION_PSERIES(vec, label,			\

	__MASKABLE_RELON_EXCEPTION_PSERIES(vec, label,			\

					   EXC_STD, SOFTEN_NOTEST_PR, bitmask)



#define MASKABLE_RELON_EXCEPTION_PSERIES_OOL(vec, label, bitmask)	\
@@ -663,7 +660,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) 
	EXCEPTION_PROLOG_2(label, EXC_STD);



#define MASKABLE_RELON_EXCEPTION_HV(loc, vec, label, bitmask)		\

	_MASKABLE_RELON_EXCEPTION_PSERIES(vec, label,			\

	__MASKABLE_RELON_EXCEPTION_PSERIES(vec, label,			\

					   EXC_HV, SOFTEN_TEST_HV, bitmask)



#define MASKABLE_RELON_EXCEPTION_HV_OOL(vec, label, bitmask)		\

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

+2 −2
Original line number Diff line number Diff line
@@ -782,11 +782,11 @@ EXC_VIRT_BEGIN(hardware_interrupt, 0x4500, 0x100) 
	.globl hardware_interrupt_relon_hv;

hardware_interrupt_relon_hv:

	BEGIN_FTR_SECTION

		_MASKABLE_RELON_EXCEPTION_PSERIES(0x500, hardware_interrupt_common,

		__MASKABLE_RELON_EXCEPTION_PSERIES(0x500, hardware_interrupt_common,

						  EXC_HV, SOFTEN_TEST_HV,

						  IRQS_DISABLED)

	FTR_SECTION_ELSE

		_MASKABLE_RELON_EXCEPTION_PSERIES(0x500, hardware_interrupt_common,

		__MASKABLE_RELON_EXCEPTION_PSERIES(0x500, hardware_interrupt_common,

						  EXC_STD, SOFTEN_TEST_PR,

						  IRQS_DISABLED)

	ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE)