From: Bobby Eshleman <bobby.eshleman@gmail.com>
Date: Tue, 28 Sep 2021 20:30:24 +0000 (-0700)
Subject: arm/traps: remove debugger_trap_fatal() calls
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~1216
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8b3cbdbe782cae972e9a47cf22620ebee61a96a6;p=xen.git

arm/traps: remove debugger_trap_fatal() calls

ARM doesn't actually use debugger_trap_* anything, and is stubbed out.

This commit simply removes the unneeded calls.

Signed-off-by: Bobby Eshleman <bobby.eshleman@gmail.com>
Acked-by: Julien Grall <jgrall@amazon.com>
---

diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 8757210a79..9339d12f58 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -42,7 +42,6 @@
 #include <asm/acpi.h>
 #include <asm/cpuerrata.h>
 #include <asm/cpufeature.h>
-#include <asm/debugger.h>
 #include <asm/event.h>
 #include <asm/hsr.h>
 #include <asm/mmio.h>
@@ -1267,10 +1266,6 @@ int do_bug_frame(const struct cpu_user_regs *regs, vaddr_t pc)
 
     case BUGFRAME_bug:
         printk("Xen BUG at %s%s:%d\n", prefix, filename, lineno);
-
-        if ( debugger_trap_fatal(TRAP_invalid_op, regs) )
-            return 0;
-
         show_execution_state(regs);
         panic("Xen BUG at %s%s:%d\n", prefix, filename, lineno);
 
@@ -1282,8 +1277,6 @@ int do_bug_frame(const struct cpu_user_regs *regs, vaddr_t pc)
 
         printk("Assertion '%s' failed at %s%s:%d\n",
                predicate, prefix, filename, lineno);
-        if ( debugger_trap_fatal(TRAP_invalid_op, regs) )
-            return 0;
         show_execution_state(regs);
         panic("Assertion '%s' failed at %s%s:%d\n",
               predicate, prefix, filename, lineno);