diff options
author | Steven Rostedt <rostedt@goodmis.org> | 2008-10-31 09:36:38 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 05:03:43 -0500 |
commit | 7e5e26a3d8ac4bcadb380073dc9604c07a9a6198 (patch) | |
tree | 68f6e0ab79358b198ba9cf404d647d2188146292 /arch/x86/include/asm/ftrace.h | |
parent | 7a895f53cda9d9362c30144e42c124a1ae996b9e (diff) |
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 'arch/x86/include/asm/ftrace.h')
-rw-r--r-- | arch/x86/include/asm/ftrace.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h index a23468194b8c..f8173ed1c970 100644 --- a/arch/x86/include/asm/ftrace.h +++ b/arch/x86/include/asm/ftrace.h | |||
@@ -17,23 +17,7 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) | |||
17 | */ | 17 | */ |
18 | return addr - 1; | 18 | return addr - 1; |
19 | } | 19 | } |
20 | |||
21 | #ifdef CONFIG_DYNAMIC_FTRACE | ||
22 | extern void ftrace_nmi_enter(void); | ||
23 | extern void ftrace_nmi_exit(void); | ||
24 | #else | ||
25 | static inline void ftrace_nmi_enter(void) { } | ||
26 | static inline void ftrace_nmi_exit(void) { } | ||
27 | #endif | ||
28 | #endif /* __ASSEMBLY__ */ | 20 | #endif /* __ASSEMBLY__ */ |
29 | |||
30 | #else /* CONFIG_FUNCTION_TRACER */ | ||
31 | |||
32 | #ifndef __ASSEMBLY__ | ||
33 | static inline void ftrace_nmi_enter(void) { } | ||
34 | static inline void ftrace_nmi_exit(void) { } | ||
35 | #endif | ||
36 | |||
37 | #endif /* CONFIG_FUNCTION_TRACER */ | 21 | #endif /* CONFIG_FUNCTION_TRACER */ |
38 | 22 | ||
39 | #endif /* _ASM_X86_FTRACE_H */ | 23 | #endif /* _ASM_X86_FTRACE_H */ |