aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2008-10-31 00:03:22 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-31 10:29:17 +0100
commita26a2a27396c0a0877aa701f8f92d08ba550a6c9 (patch)
tree8e314b970e0219419b89204d3197fbc1257bf36e /arch/x86/include/asm
parentb807c3d0f8e39ed7cbbbe6da162650e305e8de15 (diff)
downloadmrst-s0i3-test-a26a2a27396c0a0877aa701f8f92d08ba550a6c9.tar.gz
mrst-s0i3-test-a26a2a27396c0a0877aa701f8f92d08ba550a6c9.tar.xz
mrst-s0i3-test-a26a2a27396c0a0877aa701f8f92d08ba550a6c9.zip
ftrace: nmi safe code clean ups
Impact: cleanup This patch cleans up the NMI safe code for dynamic ftrace as suggested by Andrew Morton. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/ftrace.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
index f2ed6b704a7..a23468194b8 100644
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@ -22,16 +22,16 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
extern void ftrace_nmi_enter(void);
extern void ftrace_nmi_exit(void);
#else
-#define ftrace_nmi_enter() do { } while (0)
-#define ftrace_nmi_exit() do { } while (0)
-#endif
+static inline void ftrace_nmi_enter(void) { }
+static inline void ftrace_nmi_exit(void) { }
#endif
+#endif /* __ASSEMBLY__ */
#else /* CONFIG_FUNCTION_TRACER */
#ifndef __ASSEMBLY__
-#define ftrace_nmi_enter() do { } while (0)
-#define ftrace_nmi_exit() do { } while (0)
+static inline void ftrace_nmi_enter(void) { }
+static inline void ftrace_nmi_exit(void) { }
#endif
#endif /* CONFIG_FUNCTION_TRACER */