diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2008-10-31 09:36:38 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 11:03:43 +0100 |
| commit | 7e5e26a3d8ac4bcadb380073dc9604c07a9a6198 (patch) | |
| tree | 68f6e0ab79358b198ba9cf404d647d2188146292 /include/linux | |
| parent | 7a895f53cda9d9362c30144e42c124a1ae996b9e (diff) | |
| download | linux-stable-7e5e26a3d8ac4bcadb380073dc9604c07a9a6198.tar.gz linux-stable-7e5e26a3d8ac4bcadb380073dc9604c07a9a6198.tar.bz2 linux-stable-7e5e26a3d8ac4bcadb380073dc9604c07a9a6198.zip | |
ftrace: fix hardirq header for non ftrace archs
Impact: build fix for non-ftrace architectures
Not all archs implement ftrace, and therefore do not have an asm/ftrace.h.
This patch corrects the problem.
The ftrace_nmi_enter/exit now must be defined for all archs that implement
dynamic ftrace. Currently, only x86 does.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ftrace.h | 5 | ||||
| -rw-r--r-- | include/linux/hardirq.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index e46a7b34037c..0ad1b48aea69 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -44,7 +44,6 @@ static inline void ftrace_kill(void) { } #endif /* CONFIG_FUNCTION_TRACER */ #ifdef CONFIG_DYNAMIC_FTRACE - enum { FTRACE_FL_FREE = (1 << 0), FTRACE_FL_FAILED = (1 << 1), @@ -105,6 +104,8 @@ extern void ftrace_release(void *start, unsigned long size); extern void ftrace_disable_daemon(void); extern void ftrace_enable_daemon(void); +extern void ftrace_nmi_enter(void); +extern void ftrace_nmi_exit(void); #else # define skip_trace(ip) ({ 0; }) @@ -113,6 +114,8 @@ extern void ftrace_enable_daemon(void); # define ftrace_disable_daemon() do { } while (0) # define ftrace_enable_daemon() do { } while (0) static inline void ftrace_release(void *start, unsigned long size) { } +static inline void ftrace_nmi_enter(void) { } +static inline void ftrace_nmi_exit(void) { } #endif /* CONFIG_DYNAMIC_FTRACE */ /* totally disable ftrace - can not re-enable after this */ diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h index 0087cb43becf..ffc16ab5a878 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h @@ -4,8 +4,8 @@ #include <linux/preempt.h> #include <linux/smp_lock.h> #include <linux/lockdep.h> +#include <linux/ftrace.h> #include <asm/hardirq.h> -#include <asm/ftrace.h> #include <asm/system.h> /* |