From: Andi Kleen <ak@suse.de>
Date: Tue, 26 Sep 2006 08:52:37 +0000 (+0200)
Subject: [PATCH] Add a missing check for irq flags tracing in NMI
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7a0a2dff1cac1df82acfa0395bc9bc1bf0bc16ef;p=openwrt%2Fstaging%2Fblogic.git

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

diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 780f9b26169f..4fcc0ad8bbeb 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