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 'linus' into x86/nmi
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
traps_32.c
diff --git
a/arch/x86/kernel/traps_32.c
b/arch/x86/kernel/traps_32.c
index
f31e665
..
cf37d20
100644
(file)
--- a/
arch/x86/kernel/traps_32.c
+++ b/
arch/x86/kernel/traps_32.c
@@
-544,6
+544,7
@@
vm86_trap:
#define DO_ERROR(trapnr, signr, str, name) \
void do_##name(struct pt_regs *regs, long error_code) \
{ \
+ trace_hardirqs_fixup(); \
if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \
== NOTIFY_STOP) \
return; \