--- zzzz-none-000/linux-4.9.279/arch/arm/kernel/traps.c	2021-08-08 06:38:54.000000000 +0000
+++ puma7-arm-6591-750/linux-4.9.279/arch/arm/kernel/traps.c	2023-02-08 10:58:12.000000000 +0000
@@ -39,6 +39,13 @@
 #include <asm/system_misc.h>
 #include <asm/opcodes.h>
 
+#if defined(CONFIG_AVM_ENHANCED)
+#include <asm/avm_enh/avm_enh.h>
+#endif/*--- #if defined(CONFIG_AVM_ENHANCED) ---*/
+#if defined(CONFIG_AVM_FIQ_PUMA7)
+#include <mach/avm_fiq.h>
+#endif
+
 
 static const char *handler[]= {
 	"prefetch abort",
@@ -66,7 +73,11 @@
 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
 {
 #ifdef CONFIG_KALLSYMS
-	printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
+#if defined(CONFIG_AVM_ENHANCED)
+	printk(KERN_ERR"%04lx: [<%08lx>] (%pS)\n", frame & (THREAD_SIZE - 1), where, (void *)where);
+#else/*--- #if defined(CONFIG_AVM_ENHANCED) ---*/
+	printk("[<%08lx>] (%pS) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
+#endif/*--- #else ---*//*--- #if defined(CONFIG_AVM_ENHANCED) ---*/
 #else
 	printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
 #endif
@@ -243,6 +254,9 @@
 
 void show_stack(struct task_struct *tsk, unsigned long *sp)
 {
+#if defined(CONFIG_AVM_ENHANCED)
+	printk(KERN_EMERG"Backtrace:\n");
+#endif/*--- #endif ---*//*--- #if defined(CONFIG_AVM_ENHANCED) ---*/
 	dump_backtrace(NULL, tsk);
 	barrier();
 }
@@ -284,9 +298,16 @@
 
 	if (!user_mode(regs) || in_interrupt()) {
 		dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-			 THREAD_SIZE + (unsigned long)task_stack_page(tsk));
+				min((regs->ARM_sp & (~(THREAD_SIZE - 1))) + THREAD_SIZE,
+					(regs->ARM_sp + (PAGE_SIZE >> 1))));
 		dump_backtrace(regs, tsk);
 		dump_instr(KERN_EMERG, regs);
+#if defined(CONFIG_AVM_FIQ_PUMA7)
+		avm_fiq_dump_stat();
+#endif/*--- #if defined(CONFIG_AVM_PUMA7_FIQ) ---*/
+#if defined(CONFIG_AVM_ENHANCED)
+		show_stacktrace_memoryclassifier(regs);
+#endif/*--- #if defined(CONFIG_AVM_ENHANCED) ---*/
 	}
 
 	return 0;