diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-28 23:19:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-28 23:19:47 -0500 |
| commit | e3c6d4ee545e427b55882d97d3b663c6411645fe (patch) | |
| tree | 294326663fb757739a98083c2ddd570d1eaf7337 /include/linux/ftrace_irq.h | |
| parent | 5bc053089376217943187ed5153d0d1e5c5085b6 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sparc64/kernel/idprom.c
Diffstat (limited to 'include/linux/ftrace_irq.h')
| -rw-r--r-- | include/linux/ftrace_irq.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/ftrace_irq.h b/include/linux/ftrace_irq.h new file mode 100644 index 000000000000..366a054d0b05 --- /dev/null +++ b/include/linux/ftrace_irq.h | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | #ifndef _LINUX_FTRACE_IRQ_H | ||
| 2 | #define _LINUX_FTRACE_IRQ_H | ||
| 3 | |||
| 4 | |||
| 5 | #if defined(CONFIG_DYNAMIC_FTRACE) || defined(CONFIG_FUNCTION_GRAPH_TRACER) | ||
| 6 | extern void ftrace_nmi_enter(void); | ||
| 7 | extern void ftrace_nmi_exit(void); | ||
| 8 | #else | ||
| 9 | static inline void ftrace_nmi_enter(void) { } | ||
| 10 | static inline void ftrace_nmi_exit(void) { } | ||
| 11 | #endif | ||
| 12 | |||
| 13 | #endif /* _LINUX_FTRACE_IRQ_H */ | ||