From: Nicholas Piggin Date: Wed, 21 Sep 2016 07:43:41 +0000 (+1000) Subject: powerpc/64s: Consolidate Hypervisor Decrementer 0x980 interrupt X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=facc6d742428909842bf8ff4cd3abed976fbc123;p=linux-beck.git powerpc/64s: Consolidate Hypervisor Decrementer 0x980 interrupt Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman --- diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 01d5af00f2e2..f9fe906feb37 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -843,6 +843,10 @@ EXC_COMMON_ASYNC(decrementer_common, 0x900, timer_interrupt) EXC_REAL_HV(hdecrementer, 0x980, 0xa00) +EXC_VIRT_HV(hdecrementer, 0x4980, 0x4a00, 0x980) +TRAMP_KVM_HV(PACA_EXGEN, 0x980) +EXC_COMMON(hdecrementer_common, 0x980, hdec_interrupt) + EXC_REAL_MASKABLE(doorbell_super, 0xa00, 0xb00) @@ -973,7 +977,6 @@ EXC_REAL_NONE(0x1800, 0x1900) /*** Out of line interrupts support ***/ /* moved from 0x200 */ -TRAMP_KVM_HV(PACA_EXGEN, 0x980) #ifdef CONFIG_PPC_DENORMALISATION TRAMP_REAL_BEGIN(denorm_assist) @@ -1193,7 +1196,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt) /*** Common interrupt handlers ***/ -EXC_COMMON(hdecrementer_common, 0x980, hdec_interrupt) #ifdef CONFIG_PPC_DOORBELL EXC_COMMON_ASYNC(doorbell_super_common, 0xa00, doorbell_exception) @@ -1236,7 +1238,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -EXC_VIRT_HV(hdecrementer, 0x4980, 0x4a00, 0x980) EXC_VIRT_MASKABLE(doorbell_super, 0x4a00, 0x4b00, 0xa00) EXC_VIRT(trap_0b, 0x4b00, 0x4c00, 0xb00)