git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/ice1724-pm' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
dumpstack.c
diff --git
a/arch/x86/kernel/dumpstack.c
b/arch/x86/kernel/dumpstack.c
index
95ea5fa
..
c840571
100644
(file)
--- a/
arch/x86/kernel/dumpstack.c
+++ b/
arch/x86/kernel/dumpstack.c
@@
-22,6
+22,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;