commit 7a0a2dff1cac1df82acfa0395bc9bc1bf0bc16ef
author Andi Kleen <ak@suse.de> Tue Sep 26 10:52:37 2006 +0200
committer Andi Kleen <andi@basil.nowhere.org> Tue Sep 26 10:52:37 2006 +0200
tree 410b323cd17b675597134f6a3fff8a326d974670
parent aecc63615e15de861db7436c50dade495639132c

[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>

arch/x86_64/kernel/entry.S

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 @@
 	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