From 40e1b1cfb529891307b21f6e336d6375d4662cb7 Mon Sep 17 00:00:00 2001 From: Nicholas Piggin Date: Tue, 13 Sep 2016 13:08:39 +1000 Subject: [PATCH] powerpc/pseries: Fix HV facility unavailable to use correct handler The 0xf80 hv_facility_unavailable trampoline branches to the 0xf60 handler. This works because they both do the same thing, but it should be fixed. Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman --- arch/powerpc/kernel/exceptions-64s.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 3d1f3cfe5896..a91308d6abaf 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -350,7 +350,7 @@ facility_unavailable_trampoline: hv_facility_unavailable_trampoline: SET_SCRATCH0(r13) EXCEPTION_PROLOG_0(PACA_EXGEN) - b facility_unavailable_hv + b hv_facility_unavailable_hv #ifdef CONFIG_CBE_RAS STD_EXCEPTION_HV(0x1200, 0x1202, cbe_system_error) @@ -592,7 +592,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) KVM_HANDLER(PACA_EXGEN, EXC_STD, 0xf40) STD_EXCEPTION_PSERIES_OOL(0xf60, facility_unavailable) KVM_HANDLER(PACA_EXGEN, EXC_STD, 0xf60) - STD_EXCEPTION_HV_OOL(0xf82, facility_unavailable) + STD_EXCEPTION_HV_OOL(0xf82, hv_facility_unavailable) KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xf82) /* -- 2.39.5