diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-27 04:06:10 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-27 04:06:10 -0500 |
| commit | 6fb83029db161141d68cf019760a893d03d0682b (patch) | |
| tree | 6f149c23cedc9b2a5f72b5b90ab8426b39afbb7c /include | |
| parent | 281b3714e91162b66add1cfac404cf7b81e3e2f2 (diff) | |
| parent | e01292b1fd68ff2abe234d584b06e64344d2c1de (diff) | |
Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ftrace.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 0b4f97d24d7f..1cbb36f2759c 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h | |||
| @@ -511,4 +511,10 @@ static inline void trace_hw_branch_oops(void) {} | |||
| 511 | 511 | ||
| 512 | #endif /* CONFIG_HW_BRANCH_TRACER */ | 512 | #endif /* CONFIG_HW_BRANCH_TRACER */ |
| 513 | 513 | ||
| 514 | #ifdef CONFIG_FTRACE_SYSCALLS | ||
| 515 | |||
| 516 | unsigned long arch_syscall_addr(int nr); | ||
| 517 | |||
| 518 | #endif /* CONFIG_FTRACE_SYSCALLS */ | ||
| 519 | |||
| 514 | #endif /* _LINUX_FTRACE_H */ | 520 | #endif /* _LINUX_FTRACE_H */ |