Signed-off-by: Nicholas Piggin <npig...@gmail.com> --- arch/powerpc/kernel/exceptions-64s.S | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index f0493e5..7b76b79 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1012,6 +1012,12 @@ COMMON_HANDLER_ASYNC(h_doorbell_common, 0xe80, unknown_exception) __VECTOR_HANDLER_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0, 0xec0) +__TRAMP_HANDLER_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0) +__VECTOR_HANDLER_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x4ec0) +__TRAMP_HANDLER_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0xea0) +TRAMP_KVM_HV(PACA_EXGEN, 0xea0) +COMMON_HANDLER_ASYNC(h_virt_irq_common, 0xea0, do_IRQ) + VECTOR_HANDLER_REAL_NONE(0xec0, 0xf00) @@ -1152,10 +1158,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) #endif TRAMP_HANDLER_END(denorm_assist) - /* moved from 0xe00 */ -__TRAMP_HANDLER_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0) -TRAMP_KVM_HV(PACA_EXGEN, 0xea0) - /* moved from 0xf00 */ __TRAMP_HANDLER_REAL_OOL(performance_monitor, 0xf00) TRAMP_KVM(PACA_EXGEN, 0xf00) @@ -1294,7 +1296,6 @@ TRAMP_HANDLER_END(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -COMMON_HANDLER_ASYNC(h_virt_irq_common, 0xea0, do_IRQ) COMMON_HANDLER_ASYNC(performance_monitor_common, 0xf00, performance_monitor_exception) COMMON_HANDLER(instruction_breakpoint_common, 0x1300, instruction_breakpoint_exception) COMMON_HANDLER_HV(denorm_common, 0x1500, unknown_exception) @@ -1325,7 +1326,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception) -__VECTOR_HANDLER_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x4ec0) VECTOR_HANDLER_VIRT_NONE(0x4ec0, 0x4f00) @@ -1431,7 +1431,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX) COMMON_HANDLER_END(vsx_unavailable_common) /* Equivalents to the above handlers for relocation-on interrupt vectors */ -__TRAMP_HANDLER_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0xea0) __TRAMP_HANDLER_VIRT_OOL(performance_monitor, 0xf00) __TRAMP_HANDLER_VIRT_OOL(altivec_unavailable, 0xf20) __TRAMP_HANDLER_VIRT_OOL(vsx_unavailable, 0xf40) -- 2.9.3