x86: Remove duplicated #include

[mv-sheeva.git] / arch / x86 / kernel / dumpstack.c

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index dd2130b0fb3e4ac183e1d62a979242db6b78f22e..2d8a371d43396a61e2afb53f0478ba48634d87ad 100644 (file)
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -21,6 +21,7 @@
 #include "dumpstack.h"
 
 int panic_on_unrecovered_nmi;
+int panic_on_io_nmi;
 unsigned int code_bytes = 64;
 int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE;
 static int die_counter;
@@ -196,6 +197,11 @@ unsigned __kprobes long oops_begin(void)
        int cpu;
        unsigned long flags;
 
+       /* notify the hw-branch tracer so it may disable tracing and
+          add the last trace to the trace buffer -
+          the earlier this happens, the more useful the trace. */
+       trace_hw_branch_oops();
+
        oops_enter();
 
        /* racy, but better than risking deadlock. */