diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2016-09-21 17:44:02 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-04 13:07:14 +1100 |
| commit | 69a793444c7a159e66ee3a0a407a2dad7ef5d116 (patch) | |
| tree | fd2332d7ba8db06b3163107bf43fb78dc32b7b83 /arch/powerpc/kernel | |
| parent | d7e898491c6f5d363c2528351254e8499aef5dd3 (diff) | |
powerpc/64s: Consolidate Debug 0x1600 interrupt
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel')
| -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 04d25c76adee..40da203d4a07 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1242,13 +1242,14 @@ EXC_COMMON_HV(denorm_common, 0x1500, unknown_exception) #ifdef CONFIG_CBE_RAS EXC_REAL_HV(cbe_maintenance, 0x1600, 0x1700) - +EXC_VIRT_NONE(0x5600, 0x5700) TRAMP_KVM_HV_SKIP(PACA_EXGEN, 0x1600) - +EXC_COMMON(cbe_maintenance_common, 0x1600, cbe_maintenance_exception) #else /* CONFIG_CBE_RAS */ EXC_REAL_NONE(0x1600, 0x1700) #endif + EXC_REAL(altivec_assist, 0x1700, 0x1800) TRAMP_KVM(PACA_EXGEN, 0x1700) @@ -1409,8 +1410,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -EXC_VIRT_NONE(0x5600, 0x5700) - EXC_VIRT(altivec_assist, 0x5700, 0x5800, 0x1700) EXC_VIRT_NONE(0x5800, 0x5900) @@ -1433,7 +1432,6 @@ __end_interrupts: DEFINE_FIXED_SYMBOL(__end_interrupts) #ifdef CONFIG_CBE_RAS -EXC_COMMON(cbe_maintenance_common, 0x1600, cbe_maintenance_exception) EXC_COMMON(cbe_thermal_common, 0x1800, cbe_thermal_exception) #endif /* CONFIG_CBE_RAS */ |