diff options
author | Steven Rostedt <srostedt@redhat.com> | 2009-02-06 01:45:16 -0500 |
---|---|---|
committer | Steven Rostedt <srostedt@redhat.com> | 2009-02-07 20:03:33 -0500 |
commit | a81bd80a0b0a405dc0483e2c428332d69da2c79f (patch) | |
tree | 8543662a0ad8199bde641c1fd4a42929d684ffaf /include/linux | |
parent | 9a5fd902273d01170fd033691bd70b142baa7309 (diff) |
ring-buffer: use generic version of in_nmi
Impact: clean up
Now that a generic in_nmi is available, this patch removes the
special code in the ring_buffer and implements the in_nmi generic
version instead.
With this change, I was also able to rename the "arch_ftrace_nmi_enter"
back to "ftrace_nmi_enter" and remove the code from the ring buffer.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ftrace_irq.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/ftrace_irq.h b/include/linux/ftrace_irq.h index 29de6779a963..dca7bf8cffe2 100644 --- a/include/linux/ftrace_irq.h +++ b/include/linux/ftrace_irq.h | |||
@@ -3,14 +3,6 @@ | |||
3 | 3 | ||
4 | 4 | ||
5 | #ifdef CONFIG_FTRACE_NMI_ENTER | 5 | #ifdef CONFIG_FTRACE_NMI_ENTER |
6 | extern void arch_ftrace_nmi_enter(void); | ||
7 | extern void arch_ftrace_nmi_exit(void); | ||
8 | #else | ||
9 | static inline void arch_ftrace_nmi_enter(void) { } | ||
10 | static inline void arch_ftrace_nmi_exit(void) { } | ||
11 | #endif | ||
12 | |||
13 | #ifdef CONFIG_RING_BUFFER | ||
14 | extern void ftrace_nmi_enter(void); | 6 | extern void ftrace_nmi_enter(void); |
15 | extern void ftrace_nmi_exit(void); | 7 | extern void ftrace_nmi_exit(void); |
16 | #else | 8 | #else |