diff -r e99a587311ea -r fb94dc5904b6 src/arch/arm/linux/system.cc
--- a/src/arch/arm/linux/system.cc	Fri Apr 01 14:12:48 2016 +0100
+++ b/src/arch/arm/linux/system.cc	Fri Apr 01 14:13:00 2016 +0100
@@ -68,10 +68,6 @@
     if (p->panic_on_panic) {
         kernelPanicEvent = addKernelFuncEventOrPanic<PanicPCEvent>(
             "panic", "Kernel panic in simulated kernel");
-    } else {
-#ifndef NDEBUG
-        kernelPanicEvent = addKernelFuncEventOrPanic<BreakPCEvent>("panic");
-#endif
     }
 
     if (p->panic_on_oops) {