diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 04:17:09 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 04:17:09 -0500 |
| commit | 60a011c736e7dd09a0b01ca6a051a416f3f52ffb (patch) | |
| tree | 20e91db58c3bbfa622d3ed8ec747e4974a807284 /include/linux/ftrace_irq.h | |
| parent | d06bbd669539215405874d8fe32ab65105e6c4bb (diff) | |
| parent | 19b3e9671c5a219b8c34da2cc66e0ce7c3a501ae (diff) | |
Merge branch 'tracing/function-return-tracer' into tracing/fastboot
Diffstat (limited to 'include/linux/ftrace_irq.h')
| -rw-r--r-- | include/linux/ftrace_irq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ftrace_irq.h b/include/linux/ftrace_irq.h index b1299d6729f2..0b4df55d7a74 100644 --- a/include/linux/ftrace_irq.h +++ b/include/linux/ftrace_irq.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define _LINUX_FTRACE_IRQ_H | 2 | #define _LINUX_FTRACE_IRQ_H |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | #ifdef CONFIG_DYNAMIC_FTRACE | 5 | #if defined(CONFIG_DYNAMIC_FTRACE) || defined(CONFIG_FUNCTION_RET_TRACER) |
| 6 | extern void ftrace_nmi_enter(void); | 6 | extern void ftrace_nmi_enter(void); |
| 7 | extern void ftrace_nmi_exit(void); | 7 | extern void ftrace_nmi_exit(void); |
| 8 | #else | 8 | #else |