From 6915c737ead60e7db290cf24f48c0ca238e3aad8 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Tue, 15 Jan 2013 22:11:19 -0500
Subject: [PATCH] --- yaml --- r: 349849 b: refs/heads/master c:
 0f1ac8fd254b6c3e77950a1c4ee67be5dc88f7e0 h: refs/heads/master i:   349847:
 8459346bc63392fb7bac461c1fc8f40ed2bb98dc v: v3

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

diff --git a/[refs] b/[refs]
index ab2756a7456c..a94e84e91b58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84c6cf0db6a00601eb43cfc08244a398ffb0894c
+refs/heads/master: 0f1ac8fd254b6c3e77950a1c4ee67be5dc88f7e0
diff --git a/trunk/include/linux/hardirq.h b/trunk/include/linux/hardirq.h
index 624ef3f45c8e..57bfdce8fb90 100644
--- a/trunk/include/linux/hardirq.h
+++ b/trunk/include/linux/hardirq.h
@@ -180,10 +180,10 @@ extern void irq_exit(void);
 
 #define nmi_enter()						\
 	do {							\
+		lockdep_off();					\
 		ftrace_nmi_enter();				\
 		BUG_ON(in_nmi());				\
 		add_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET);	\
-		lockdep_off();					\
 		rcu_nmi_enter();				\
 		trace_hardirq_enter();				\
 	} while (0)
@@ -192,10 +192,10 @@ extern void irq_exit(void);
 	do {							\
 		trace_hardirq_exit();				\
 		rcu_nmi_exit();					\
-		lockdep_on();					\
 		BUG_ON(!in_nmi());				\
 		sub_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET);	\
 		ftrace_nmi_exit();				\
+		lockdep_on();					\
 	} while (0)
 
 #endif /* LINUX_HARDIRQ_H */