summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/exceptions-64s.S
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2016-09-21 17:43:43 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2016-10-04 13:07:04 +1100
commit341215dc12d0209538fe49397039acd37b1bc2ea (patch)
tree45eb4b5004ef1ac32bc7873c0848f3c1f0d7f647 /arch/powerpc/kernel/exceptions-64s.S
parentca2431633b414d112c39ec69d85d96f090e49453 (diff)
powerpc/64s: Consolidate Reserved 0xb00 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.S7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index f73a10aaf54a..54dd9b8aba9a 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -859,8 +859,10 @@ EXC_COMMON_ASYNC(doorbell_super_common, 0xa00, unknown_exception)
EXC_REAL(trap_0b, 0xb00, 0xc00)
-
+EXC_VIRT(trap_0b, 0x4b00, 0x4c00, 0xb00)
TRAMP_KVM(PACA_EXGEN, 0xb00)
+EXC_COMMON(trap_0b_common, 0xb00, unknown_exception)
+
EXC_REAL_BEGIN(system_call, 0xc00, 0xd00)
/*
@@ -1203,7 +1205,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt)
/*** Common interrupt handlers ***/
-EXC_COMMON(trap_0b_common, 0xb00, unknown_exception)
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)
@@ -1239,8 +1240,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception)
* come here.
*/
-EXC_VIRT(trap_0b, 0x4b00, 0x4c00, 0xb00)
-
EXC_VIRT_BEGIN(system_call, 0x4c00, 0x4d00)
HMT_MEDIUM
SYSCALL_PSERIES_1