diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2016-09-21 17:43:45 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-04 13:07:05 +1100 |
| commit | bc6675c6087e7120585333e0bcffe40d64394431 (patch) | |
| tree | 62a230523e9abe75a1cc0e4fc31d12e7a983eb68 /arch/powerpc | |
| parent | d807ad37e8016b1e7220d455f24c5ad1450c6426 (diff) | |
powerpc/64s: Consolidate Trace 0xd00 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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 6d4d7800895a..f47c36d605d6 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -902,8 +902,9 @@ TRAMP_KVM(PACA_EXGEN, 0xc00) EXC_REAL(single_step, 0xd00, 0xe00) - +EXC_VIRT(single_step, 0x4d00, 0x4e00, 0xd00) TRAMP_KVM(PACA_EXGEN, 0xd00) +EXC_COMMON(single_step_common, 0xd00, single_step_exception) /* At 0xe??? we have a bunch of hypervisor exceptions, we branch @@ -1213,7 +1214,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -EXC_COMMON(single_step_common, 0xd00, single_step_exception) EXC_COMMON(trap_0e_common, 0xe00, unknown_exception) EXC_COMMON(emulation_assist_common, 0xe40, emulation_assist_interrupt) EXC_COMMON_ASYNC(hmi_exception_common, 0xe60, handle_hmi_exception) @@ -1248,8 +1248,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -EXC_VIRT(single_step, 0x4d00, 0x4e00, 0xd00) - EXC_VIRT_BEGIN(unused, 0x4e00, 0x4e20) b . /* Can't happen, see v2.07 Book III-S section 6.5 */ EXC_VIRT_END(unused, 0x4e00, 0x4e20) |