summaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 10:52:37 +0200
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 10:52:37 +0200
commit7a0a2dff1cac1df82acfa0395bc9bc1bf0bc16ef (patch)
tree410b323cd17b675597134f6a3fff8a326d974670 /arch/x86_64
parentaecc63615e15de861db7436c50dade495639132c (diff)
downloadop-kernel-dev-7a0a2dff1cac1df82acfa0395bc9bc1bf0bc16ef.zip
op-kernel-dev-7a0a2dff1cac1df82acfa0395bc9bc1bf0bc16ef.tar.gz
[PATCH] Add a missing check for irq flags tracing in NMI
NMIs are not supposed to track the irq flags, but TRACE_IRQS_IRETQ did it anyways. Add a check. Cc: mingo@elte.hu Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/entry.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 780f9b2..4fcc0ad 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -773,7 +773,9 @@ paranoid_exit\trace:
testl $3,CS(%rsp)
jnz paranoid_userspace\trace
paranoid_swapgs\trace:
+ .if \trace
TRACE_IRQS_IRETQ 0
+ .endif
swapgs
paranoid_restore\trace:
RESTORE_ALL 8
OpenPOWER on IntegriCloud