projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 98b665d)
powerpc/pseries: Fix HV facility unavailable to use correct handler
authorNicholas Piggin <npiggin@gmail.com>
Tue, 13 Sep 2016 03:08:39 +0000 (13:08 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 22 Sep 2016 21:54:19 +0000 (07:54 +1000)
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 <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/exceptions-64s.S patch | blob | blame | history

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 3d1f3cfe58960c40832f41fc92aded0902c6c670..a91308d6abaf8a1f37a60cf60795edaaac19802a 100644 (file)
--- 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)
 
 /*