@@ -1132,13 +1132,14 @@ VECTOR_HANDLER_VIRT_NONE(0x4fa0, 0x5200)
#ifdef CONFIG_CBE_RAS
VECTOR_HANDLER_REAL_HV(cbe_system_error, 0x1200, 0x1300)
-
+VECTOR_HANDLER_VIRT_NONE(0x5200, 0x5300)
TRAMP_KVM_HV_SKIP(PACA_EXGEN, 0x1200)
-
+COMMON_HANDLER(cbe_system_error_common, 0x1200, cbe_system_error_exception)
#else /* CONFIG_CBE_RAS */
VECTOR_HANDLER_REAL_NONE(0x1200, 0x1300)
#endif
+
VECTOR_HANDLER_REAL(instruction_breakpoint, 0x1300, 0x1400)
TRAMP_KVM_SKIP(PACA_EXGEN, 0x1300)
@@ -1400,7 +1401,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception)
* come here.
*/
-VECTOR_HANDLER_VIRT_NONE(0x5200, 0x5300)
VECTOR_HANDLER_VIRT(instruction_breakpoint, 0x5300, 0x5400, 0x1300)
@@ -1437,7 +1437,6 @@ __end_interrupts:
UNUSE_FIXED_SECTION(virt_trampolines)
#ifdef CONFIG_CBE_RAS
-COMMON_HANDLER(cbe_system_error_common, 0x1200, cbe_system_error_exception)
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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)