@@ -1252,8 +1252,14 @@ VECTOR_HANDLER_REAL_NONE(0x1600, 0x1700)
VECTOR_HANDLER_REAL(altivec_assist, 0x1700, 0x1800)
-
+VECTOR_HANDLER_VIRT(altivec_assist, 0x5700, 0x5800, 0x1700)
TRAMP_KVM(PACA_EXGEN, 0x1700)
+#ifdef CONFIG_ALTIVEC
+COMMON_HANDLER(altivec_assist_common, 0x1700, altivec_assist_exception)
+#else
+COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception)
+#endif
+
#ifdef CONFIG_CBE_RAS
VECTOR_HANDLER_REAL_HV(cbe_thermal, 0x1800, 0x1900)
@@ -1391,12 +1397,6 @@ TRAMP_HANDLER_END(kvmppc_skip_Hinterrupt)
/*** Common interrupt handlers ***/
-#ifdef CONFIG_ALTIVEC
-COMMON_HANDLER(altivec_assist_common, 0x1700, altivec_assist_exception)
-#else
-COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception)
-#endif
-
/*
* Relocation-on interrupts: A subset of the interrupts can be delivered
* with IR=1/DR=1, if AIL==2 and MSR.HV won't be changed by delivering
@@ -1413,9 +1413,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception)
* come here.
*/
-
-VECTOR_HANDLER_VIRT(altivec_assist, 0x5700, 0x5800, 0x1700)
-
VECTOR_HANDLER_VIRT_NONE(0x5800, 0x5900)
TRAMP_HANDLER_BEGIN(ppc64_runlatch_on_trampoline)
Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/kernel/exceptions-64s.S | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)