Signed-off-by: Nicholas Piggin <npig...@gmail.com> --- arch/powerpc/kernel/exceptions-64s.S | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index f052fee..480c28c 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1024,6 +1024,12 @@ VECTOR_HANDLER_VIRT_NONE(0x4ec0, 0x4f00) __VECTOR_HANDLER_REAL_OOL(performance_monitor, 0xf00, 0xf20) +__TRAMP_HANDLER_REAL_OOL(performance_monitor, 0xf00) +__VECTOR_HANDLER_VIRT_OOL(performance_monitor, 0x4f00, 0x4f20) +__TRAMP_HANDLER_VIRT_OOL(performance_monitor, 0xf00) +TRAMP_KVM(PACA_EXGEN, 0xf00) +COMMON_HANDLER_ASYNC(performance_monitor_common, 0xf00, performance_monitor_exception) + __VECTOR_HANDLER_REAL_OOL(altivec_unavailable, 0xf20, 0xf40) @@ -1161,9 +1167,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) TRAMP_HANDLER_END(denorm_assist) /* moved from 0xf00 */ -__TRAMP_HANDLER_REAL_OOL(performance_monitor, 0xf00) -TRAMP_KVM(PACA_EXGEN, 0xf00) - __TRAMP_HANDLER_REAL_OOL(altivec_unavailable, 0xf20) TRAMP_KVM(PACA_EXGEN, 0xf20) @@ -1298,7 +1301,6 @@ TRAMP_HANDLER_END(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -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) #ifdef CONFIG_ALTIVEC @@ -1330,7 +1332,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception) -__VECTOR_HANDLER_VIRT_OOL(performance_monitor, 0x4f00, 0x4f20) __VECTOR_HANDLER_VIRT_OOL(altivec_unavailable, 0x4f20, 0x4f40) @@ -1432,7 +1433,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(performance_monitor, 0xf00) __TRAMP_HANDLER_VIRT_OOL(altivec_unavailable, 0xf20) __TRAMP_HANDLER_VIRT_OOL(vsx_unavailable, 0xf40) __TRAMP_HANDLER_VIRT_OOL(facility_unavailable, 0xf60) -- 2.9.3