From 6283944201c52ca8d89e23ef6a1a967985bf6326 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 12 Feb 2009 14:16:46 -0500
Subject: [PATCH] --- yaml --- r: 140735 b: refs/heads/master c:
 2a7b8df04c11a70105c1abe67d006455d3bdc944 h: refs/heads/master i:   140733:
 97e7d29973cb1b6ad7d5825ec625a6ad65709d22   140731:
 ad6ee43657521fb50f902b78752a5d3e17852cbb   140727:
 0981377922617cdacff181657ca83657fafd7ac1   140719:
 47005baa963963678d8300cfe46e6e471f4a02a1   140703:
 33662c5e5c3feb26fbc17947368aacfd843101e8   140671:
 096694d98a7c6dd1541b333eaba67209a8056175 v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/hardirq.h | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 706a5e9582b3..ac96f550cbaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a5fb7dbe88dd57dc2bef0f3be9da991e789612d
+refs/heads/master: 2a7b8df04c11a70105c1abe67d006455d3bdc944
diff --git a/trunk/include/linux/hardirq.h b/trunk/include/linux/hardirq.h
index 9841221f53f2..faa1cf848bcd 100644
--- a/trunk/include/linux/hardirq.h
+++ b/trunk/include/linux/hardirq.h
@@ -175,24 +175,24 @@ extern void irq_enter(void);
  */
 extern void irq_exit(void);
 
-#define nmi_enter()				\
-	do {					\
-		ftrace_nmi_enter();		\
-		BUG_ON(in_nmi());		\
-		add_preempt_count(NMI_OFFSET);	\
-		lockdep_off();			\
-		rcu_nmi_enter();		\
-		__irq_enter();			\
+#define nmi_enter()						\
+	do {							\
+		ftrace_nmi_enter();				\
+		BUG_ON(in_nmi());				\
+		add_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET);	\
+		lockdep_off();					\
+		rcu_nmi_enter();				\
+		trace_hardirq_enter();				\
 	} while (0)
 
-#define nmi_exit()				\
-	do {					\
-		__irq_exit();			\
-		rcu_nmi_exit();			\
-		lockdep_on();			\
-		BUG_ON(!in_nmi());		\
-		sub_preempt_count(NMI_OFFSET);	\
-		ftrace_nmi_exit();		\
+#define nmi_exit()						\
+	do {							\
+		trace_hardirq_exit();				\
+		rcu_nmi_exit();					\
+		lockdep_on();					\
+		BUG_ON(!in_nmi());				\
+		sub_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET);	\
+		ftrace_nmi_exit();				\
 	} while (0)
 
 #endif /* LINUX_HARDIRQ_H */