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

Commit 0b924de4 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/64s: Don't use __MASKABLE_EXCEPTION unnecessarily 



We only need to use __MASKABLE_EXCEPTION in one of the four cases for
hardware interrupt, so use the helper macros in the other cases.

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

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

+5 −11
Original line number Diff line number Diff line
@@ -768,13 +768,9 @@ EXC_REAL_BEGIN(hardware_interrupt, 0x500, 0x100) 
	.globl hardware_interrupt_hv;

hardware_interrupt_hv:

	BEGIN_FTR_SECTION

		__MASKABLE_EXCEPTION(0x500, hardware_interrupt_common,

					    EXC_HV, SOFTEN_TEST_HV,

					    IRQS_DISABLED)

		MASKABLE_EXCEPTION_HV(0x500, hardware_interrupt_common, IRQS_DISABLED)

	FTR_SECTION_ELSE

		__MASKABLE_EXCEPTION(0x500, hardware_interrupt_common,

					    EXC_STD, SOFTEN_TEST_PR,

					    IRQS_DISABLED)

		MASKABLE_EXCEPTION(0x500, hardware_interrupt_common, IRQS_DISABLED)

	ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)

EXC_REAL_END(hardware_interrupt, 0x500, 0x100)
@@ -782,13 +778,11 @@ EXC_VIRT_BEGIN(hardware_interrupt, 0x4500, 0x100) 
	.globl hardware_interrupt_relon_hv;

hardware_interrupt_relon_hv:

	BEGIN_FTR_SECTION

		__MASKABLE_RELON_EXCEPTION(0x500, hardware_interrupt_common,

						  EXC_HV, SOFTEN_TEST_HV,

		MASKABLE_RELON_EXCEPTION_HV(0x500, hardware_interrupt_common,

					    IRQS_DISABLED)

	FTR_SECTION_ELSE

		__MASKABLE_RELON_EXCEPTION(0x500, hardware_interrupt_common,

						  EXC_STD, SOFTEN_TEST_PR,

						  IRQS_DISABLED)

					   EXC_STD, SOFTEN_TEST_PR, IRQS_DISABLED)

	ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE)

EXC_VIRT_END(hardware_interrupt, 0x4500, 0x100)