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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
traps.c
diff --git
a/arch/i386/kernel/traps.c
b/arch/i386/kernel/traps.c
index
a13037f
..
6820b8d
100644
(file)
--- a/
arch/i386/kernel/traps.c
+++ b/
arch/i386/kernel/traps.c
@@
-57,6
+57,8
@@
#include "mach_traps.h"
+int panic_on_unrecovered_nmi;
+
asmlinkage int system_call(void);
struct desc_struct default_ldt[] = { { 0, 0 }, { 0, 0 }, { 0, 0 },