diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 6a32470ccc72..95cf506501e5 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -491,6 +491,10 @@ die_sig:
 	if (user_debug & UDBG_UNDEFINED) {
 		pr_info("%s (%d): undefined instruction: pc=%p\n",
 			current->comm, task_pid_nr(current), pc);
+#ifdef CONFIG_AMLOGIC_USER_FAULT
+		if (user_fault_debug_ratelimited())
+			show_all_pfn(current, regs);
+#endif
 		__show_regs(regs);
 		dump_instr(KERN_INFO, regs);
 	}
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 6e2d130f3306..5f2f08594cea 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -418,6 +418,10 @@ static void force_signal_inject(int signal, int code, struct pt_regs *regs,
 	    show_unhandled_signals_ratelimited()) {
 		pr_info("%s[%d]: %s: pc=%p\n",
 			current->comm, task_pid_nr(current), desc, pc);
+#ifdef CONFIG_AMLOGIC_USER_FAULT
+		show_all_pfn(current, regs);
+		show_regs(regs);
+#endif
 		dump_instr(KERN_INFO, regs);
 	}