@@ -1243,13 +1243,14 @@ COMMON_HANDLER_HV(denorm_common, 0x1500, unknown_exception)
#ifdef CONFIG_CBE_RAS
VECTOR_HANDLER_REAL_HV(cbe_maintenance, 0x1600, 0x1700)
-
+VECTOR_HANDLER_VIRT_NONE(0x5600, 0x5700)
TRAMP_KVM_HV_SKIP(PACA_EXGEN, 0x1600)
-
+COMMON_HANDLER(cbe_maintenance_common, 0x1600, cbe_maintenance_exception)
#else /* CONFIG_CBE_RAS */
VECTOR_HANDLER_REAL_NONE(0x1600, 0x1700)
#endif
+
VECTOR_HANDLER_REAL(altivec_assist, 0x1700, 0x1800)
TRAMP_KVM(PACA_EXGEN, 0x1700)
@@ -1413,8 +1414,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception)
*/
-VECTOR_HANDLER_VIRT_NONE(0x5600, 0x5700)
-
VECTOR_HANDLER_VIRT(altivec_assist, 0x5700, 0x5800, 0x1700)
VECTOR_HANDLER_VIRT_NONE(0x5800, 0x5900)
@@ -1438,7 +1437,6 @@ __end_interrupts:
UNUSE_FIXED_SECTION(virt_trampolines)
#ifdef CONFIG_CBE_RAS
-COMMON_HANDLER(cbe_maintenance_common, 0x1600, cbe_maintenance_exception)
COMMON_HANDLER(cbe_thermal_common, 0x1800, cbe_thermal_exception)
#endif /* CONFIG_CBE_RAS */
Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/kernel/exceptions-64s.S | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)