diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hardirq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h index 624ef3f45c8e..57bfdce8fb90 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h | |||
@@ -180,10 +180,10 @@ extern void irq_exit(void); | |||
180 | 180 | ||
181 | #define nmi_enter() \ | 181 | #define nmi_enter() \ |
182 | do { \ | 182 | do { \ |
183 | lockdep_off(); \ | ||
183 | ftrace_nmi_enter(); \ | 184 | ftrace_nmi_enter(); \ |
184 | BUG_ON(in_nmi()); \ | 185 | BUG_ON(in_nmi()); \ |
185 | add_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET); \ | 186 | add_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET); \ |
186 | lockdep_off(); \ | ||
187 | rcu_nmi_enter(); \ | 187 | rcu_nmi_enter(); \ |
188 | trace_hardirq_enter(); \ | 188 | trace_hardirq_enter(); \ |
189 | } while (0) | 189 | } while (0) |
@@ -192,10 +192,10 @@ extern void irq_exit(void); | |||
192 | do { \ | 192 | do { \ |
193 | trace_hardirq_exit(); \ | 193 | trace_hardirq_exit(); \ |
194 | rcu_nmi_exit(); \ | 194 | rcu_nmi_exit(); \ |
195 | lockdep_on(); \ | ||
196 | BUG_ON(!in_nmi()); \ | 195 | BUG_ON(!in_nmi()); \ |
197 | sub_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET); \ | 196 | sub_preempt_count(NMI_OFFSET + HARDIRQ_OFFSET); \ |
198 | ftrace_nmi_exit(); \ | 197 | ftrace_nmi_exit(); \ |
198 | lockdep_on(); \ | ||
199 | } while (0) | 199 | } while (0) |
200 | 200 | ||
201 | #endif /* LINUX_HARDIRQ_H */ | 201 | #endif /* LINUX_HARDIRQ_H */ |