diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2016-09-21 17:44:00 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-04 13:07:13 +1100 |
| commit | 4e96dbbfe3dc165c02c5760599c4fab1dd019276 (patch) | |
| tree | 2e8bcf914facec9550b7ea5995975573a8501ee7 /arch/powerpc | |
| parent | ff1b32064012be5458eb0ce8f88af24b329770b7 (diff) | |
powerpc/64s: Consolidate Instruction Breakpoint 0x1300 interrupt
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 537d29a6e032..0214c97c117d 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1141,8 +1141,10 @@ EXC_REAL_NONE(0x1200, 0x1300) EXC_REAL(instruction_breakpoint, 0x1300, 0x1400) - +EXC_VIRT(instruction_breakpoint, 0x5300, 0x5400, 0x1300) TRAMP_KVM_SKIP(PACA_EXGEN, 0x1300) +EXC_COMMON(instruction_breakpoint_common, 0x1300, instruction_breakpoint_exception) + EXC_REAL_BEGIN(denorm_exception_hv, 0x1500, 0x1600) mtspr SPRN_SPRG_HSCRATCH0,r13 @@ -1374,7 +1376,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -EXC_COMMON(instruction_breakpoint_common, 0x1300, instruction_breakpoint_exception) EXC_COMMON_HV(denorm_common, 0x1500, unknown_exception) #ifdef CONFIG_ALTIVEC EXC_COMMON(altivec_assist_common, 0x1700, altivec_assist_exception) @@ -1398,8 +1399,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -EXC_VIRT(instruction_breakpoint, 0x5300, 0x5400, 0x1300) - #ifdef CONFIG_PPC_DENORMALISATION EXC_VIRT_BEGIN(denorm_exception, 0x5500, 0x5600) b exc_real_0x1500_denorm_exception_hv |