diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-27 10:06:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-27 10:06:10 +0100 |
| commit | 6fb83029db161141d68cf019760a893d03d0682b (patch) | |
| tree | 6f149c23cedc9b2a5f72b5b90ab8426b39afbb7c /kernel | |
| 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 'kernel')
| -rw-r--r-- | kernel/trace/Kconfig | 2 | ||||
| -rw-r--r-- | kernel/trace/trace_syscalls.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index e6b99b8c3d3..13e13d428cd 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -440,7 +440,7 @@ config BLK_DEV_IO_TRACE config KPROBE_EVENT depends on KPROBES - depends on X86 + depends on HAVE_REGS_AND_STACK_ACCESS_API bool "Enable kprobes-based dynamic events" select TRACING default y diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 8cdda95da81..a1834dda85f 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -394,6 +394,11 @@ int init_syscall_trace(struct ftrace_event_call *call) return id; } +unsigned long __init arch_syscall_addr(int nr) +{ + return (unsigned long)sys_call_table[nr]; +} + int __init init_ftrace_syscalls(void) { struct syscall_metadata *meta; |