diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2016-09-21 17:43:59 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-04 13:07:12 +1100 |
| commit | ff1b32064012be5458eb0ce8f88af24b329770b7 (patch) | |
| tree | a73d9609b86976aa3d893459a43e3683bbd2b39a /arch/powerpc/kernel/exceptions-64s.S | |
| parent | e46b964c1a5f15fc2b8b838099f748e4b84dd339 (diff) | |
powerpc/64s: Consolidate CBE System Error 0x1200 interrupt
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 34d439018ddd..537d29a6e032 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1132,13 +1132,14 @@ EXC_VIRT_NONE(0x4fa0, 0x5200) #ifdef CONFIG_CBE_RAS EXC_REAL_HV(cbe_system_error, 0x1200, 0x1300) - +EXC_VIRT_NONE(0x5200, 0x5300) TRAMP_KVM_HV_SKIP(PACA_EXGEN, 0x1200) - +EXC_COMMON(cbe_system_error_common, 0x1200, cbe_system_error_exception) #else /* CONFIG_CBE_RAS */ EXC_REAL_NONE(0x1200, 0x1300) #endif + EXC_REAL(instruction_breakpoint, 0x1300, 0x1400) TRAMP_KVM_SKIP(PACA_EXGEN, 0x1300) @@ -1397,8 +1398,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -EXC_VIRT_NONE(0x5200, 0x5300) - EXC_VIRT(instruction_breakpoint, 0x5300, 0x5400, 0x1300) #ifdef CONFIG_PPC_DENORMALISATION @@ -1433,7 +1432,6 @@ __end_interrupts: DEFINE_FIXED_SYMBOL(__end_interrupts) #ifdef CONFIG_CBE_RAS -EXC_COMMON(cbe_system_error_common, 0x1200, cbe_system_error_exception) EXC_COMMON(cbe_maintenance_common, 0x1600, cbe_maintenance_exception) EXC_COMMON(cbe_thermal_common, 0x1800, cbe_thermal_exception) #endif /* CONFIG_CBE_RAS */ |