Signed-off-by: Nicholas Piggin <npig...@gmail.com>
---
arch/powerpc/kernel/exceptions-64s.S | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/arch/powerpc/kernel/exceptions-64s.S
b/arch/powerpc/kernel/exceptions-64s.S
index 5e7f9ed..de192dc 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -787,8 +787,17 @@ COMMON_HANDLER_END(alignment_common)
VECTOR_HANDLER_REAL(program_check, 0x700, 0x800)
-
+VECTOR_HANDLER_VIRT(program_check, 0x4700, 0x4800, 0x700)
TRAMP_KVM(PACA_EXGEN, 0x700)
+COMMON_HANDLER_BEGIN(program_check_common)
+ EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN)
+ bl save_nvgprs
+ RECONCILE_IRQ_STATE(r10, r11)
+ addi r3,r1,STACK_FRAME_OVERHEAD
+ bl program_check_exception
+ b ret_from_except
+COMMON_HANDLER_END(program_check_common)
+
VECTOR_HANDLER_REAL(fp_unavailable, 0x800, 0x900)
@@ -1199,7 +1208,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700,
unknown_exception)
-VECTOR_HANDLER_VIRT(program_check, 0x4700, 0x4800, 0x700)
VECTOR_HANDLER_VIRT(fp_unavailable, 0x4800, 0x4900, 0x800)
VECTOR_HANDLER_VIRT_MASKABLE(decrementer, 0x4900, 0x4980, 0x900)
VECTOR_HANDLER_VIRT_HV(hdecrementer, 0x4980, 0x4a00, 0x980)
@@ -1285,15 +1293,6 @@ COMMON_HANDLER_END(h_data_storage_common)
COMMON_HANDLER(h_instr_storage_common, 0xe20, unknown_exception)
-COMMON_HANDLER_BEGIN(program_check_common)
- EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN)
- bl save_nvgprs
- RECONCILE_IRQ_STATE(r10, r11)
- addi r3,r1,STACK_FRAME_OVERHEAD
- bl program_check_exception
- b ret_from_except
-COMMON_HANDLER_END(program_check_common)
-
COMMON_HANDLER_BEGIN(fp_unavailable_common)
EXCEPTION_PROLOG_COMMON(0x800, PACA_EXGEN)
bne 1f /* if from user, just load it up */
--
2.9.3
