From 4894106b96033a2ac1e450ddf3d7d02ec04e55c2 Mon Sep 17 00:00:00 2001 From: Ian Munsie Date: Thu, 3 Feb 2011 14:27:22 +1100 Subject: [PATCH] --- yaml --- r: 234432 b: refs/heads/master c: c763ba06bd9b5db2c46c36276c89103d92d2c604 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/trace/ftrace-design.txt | 3 +++ trunk/kernel/trace/trace_syscalls.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8fc34bb34f01..14ced09a9066 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3773b389b6927595512558594d040c1edba46f36 +refs/heads/master: c763ba06bd9b5db2c46c36276c89103d92d2c604 diff --git a/trunk/Documentation/trace/ftrace-design.txt b/trunk/Documentation/trace/ftrace-design.txt index dc52bd442c92..6fca17beee2f 100644 --- a/trunk/Documentation/trace/ftrace-design.txt +++ b/trunk/Documentation/trace/ftrace-design.txt @@ -247,6 +247,9 @@ You need very few things to get the syscalls tracing in an arch. - Support the TIF_SYSCALL_TRACEPOINT thread flags. - Put the trace_sys_enter() and trace_sys_exit() tracepoints calls from ptrace in the ptrace syscalls tracing path. +- If the system call table on this arch is more complicated than a simple array + of addresses of the system calls, implement an arch_syscall_addr to return + the address of a given system call. - Tag this arch as HAVE_SYSCALL_TRACEPOINTS. diff --git a/trunk/kernel/trace/trace_syscalls.c b/trunk/kernel/trace/trace_syscalls.c index 423094288fb5..af831545f656 100644 --- a/trunk/kernel/trace/trace_syscalls.c +++ b/trunk/kernel/trace/trace_syscalls.c @@ -446,7 +446,7 @@ int init_syscall_trace(struct ftrace_event_call *call) return id; } -unsigned long __init arch_syscall_addr(int nr) +unsigned long __init __weak arch_syscall_addr(int nr) { return (unsigned long)sys_call_table[nr]; }