diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 06:25:51 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 06:25:51 -0500 |
| commit | 968ea6d80e395cf11a51143cfa1b9a14ada676df (patch) | |
| tree | dc2acec8c9bdced33afe1e273ee5e0b0b93d2703 /include/linux/ftrace_irq.h | |
| parent | 7be7585393d311866653564fbcd10a3232773c0b (diff) | |
| parent | 8299608f140ae321e4eb5d1306184265d2b9511e (diff) | |
Merge ../linux-2.6-x86
Conflicts:
arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
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 */ | ||