tracing fixes
Subsystems (7)
Linus,
Please pull the latest tracing-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing-fixes-for-linus
Thanks,
Ingo
------------------>
Frederic Weisbecker (1):
tracing/syscalls: use a dedicated file header
Li Zefan (2):
blktrace: pass the right pointer to kfree()
tracing: consolidate documents
Tetsuo Handa (1):
tracing: append a comma to INIT_FTRACE_GRAPH
Documentation/{ => trace}/ftrace.txt | 0
Documentation/{vm => trace}/kmemtrace.txt | 0
Documentation/{tracers => trace}/mmiotrace.txt | 0
Documentation/{ => trace}/tracepoints.txt | 0
arch/x86/kernel/ftrace.c | 2 +
arch/x86/kernel/ptrace.c | 3 +-
include/linux/ftrace.h | 31 +--------------------
include/linux/syscalls.h | 2 +-
include/trace/syscall.h | 35 ++++++++++++++++++++++++
kernel/trace/blktrace.c | 10 +++---
kernel/trace/trace_syscalls.c | 2 +-
11 files changed, 47 insertions(+), 38 deletions(-)
rename Documentation/{ => trace}/ftrace.txt (100%)
rename Documentation/{vm => trace}/kmemtrace.txt (100%)
rename Documentation/{tracers => trace}/mmiotrace.txt (100%)
rename Documentation/{ => trace}/tracepoints.txt (100%)
create mode 100644 include/trace/syscall.hDocumentation/trace/ftrace.txt renamed from Documentation/ftrace.txt +0 -0
Documentation/trace/kmemtrace.txt renamed from Documentation/vm/kmemtrace.txt +0 -0
Documentation/trace/mmiotrace.txt renamed from Documentation/tracers/mmiotrace.txt +0 -0
Documentation/trace/tracepoints.txt renamed from Documentation/tracepoints.txt +0 -0
arch/x86/kernel/ftrace.c +2 -0
@@ -18,6 +18,8 @@#include <linux/init.h> #include <linux/list.h> +#include <trace/syscall.h> +#include <asm/cacheflush.h> #include <asm/ftrace.h> #include <asm/nops.h>
arch/x86/kernel/ptrace.c +2 -1
@@ -21,7 +21,6 @@#include <linux/audit.h> #include <linux/seccomp.h> #include <linux/signal.h> -#include <linux/ftrace.h> #include <asm/uaccess.h> #include <asm/pgtable.h>
@@ -35,6 +34,8 @@#include <asm/proto.h> #include <asm/ds.h> +#include <trace/syscall.h> +#include "tls.h" enum x86_regset {
include/linux/ftrace.h +1 -30
@@ -357,7 +357,7 @@ struct ftrace_graph_ret {#ifdef CONFIG_FUNCTION_GRAPH_TRACER /* for init task */ -#define INIT_FTRACE_GRAPH .ret_stack = NULL +#define INIT_FTRACE_GRAPH .ret_stack = NULL,/* * Stack of return addresses for functions
@@ -511,33 +511,4 @@ static inline void trace_hw_branch_oops(void) {}#endif /* CONFIG_HW_BRANCH_TRACER */ -/* -* A syscall entry in the ftrace syscalls array. -* -* @name: name of the syscall -* @nb_args: number of parameters it takes -* @types: list of types as strings -* @args: list of args as strings (args[i] matches types[i]) -*/ -struct syscall_metadata { -const char *name; -int nb_args; -const char **types; -const char **args; -}; - -#ifdef CONFIG_FTRACE_SYSCALLS -extern void arch_init_ftrace_syscalls (void ); -extern struct syscall_metadata *syscall_nr_to_meta (int nr); -extern void start_ftrace_syscalls (void ); -extern void stop_ftrace_syscalls (void ); -extern void ftrace_syscall_enter (struct pt_regs *regs); -extern void ftrace_syscall_exit (struct pt_regs *regs); -#else -static inline void start_ftrace_syscalls (void ) { } -static inline void stop_ftrace_syscalls (void ) { } -static inline void ftrace_syscall_enter (struct pt_regs *regs) { } -static inline void ftrace_syscall_exit (struct pt_regs *regs) { } -#endif -#endif /* _LINUX_FTRACE_H */
include/linux/syscalls.h +1 -1
@@ -65,7 +65,7 @@ struct old_linux_dirent;#include <asm/signal.h> #include <linux/quota.h> #include <linux/key.h> -#include <linux/ftrace.h> +#include <trace/syscall.h> #define __SC_DECL1 (t1, a1) t1 a1#define __SC_DECL2 (t2, a2, ...) t2 a2, __SC_DECL1(__VA_ARGS__)
include/trace/syscall.h new file +35 -0
@@ -0,0 +1,35 @@ +#ifndef _TRACE_SYSCALL_H +#define _TRACE_SYSCALL_H + +#include <asm/ptrace.h> + +/* +* A syscall entry in the ftrace syscalls array. +* +* @name: name of the syscall +* @nb_args: number of parameters it takes +* @types: list of types as strings +* @args: list of args as strings (args[i] matches types[i]) +*/ +struct syscall_metadata { +const char *name; +int nb_args; +const char **types; +const char **args; +}; + +#ifdef CONFIG_FTRACE_SYSCALLS +extern void arch_init_ftrace_syscalls (void ); +extern struct syscall_metadata *syscall_nr_to_meta (int nr); +extern void start_ftrace_syscalls (void ); +extern void stop_ftrace_syscalls (void ); +extern void ftrace_syscall_enter (struct pt_regs *regs); +extern void ftrace_syscall_exit (struct pt_regs *regs); +#else +static inline void start_ftrace_syscalls (void ) { } +static inline void stop_ftrace_syscalls (void ) { } +static inline void ftrace_syscall_enter (struct pt_regs *regs) { } +static inline void ftrace_syscall_exit (struct pt_regs *regs) { } +#endif + +#endif /* _TRACE_SYSCALL_H */
kernel/trace/blktrace.c +5 -5
@@ -1377,12 +1377,12 @@ static int blk_trace_str2mask(const char *str) {int i;int mask =0 ; -char *s, *token; +char *buf, *s, *token; - s =kstrdup (str,GFP_KERNEL ); -if (s ==NULL ) + buf =kstrdup (str,GFP_KERNEL ); +if (buf ==NULL )return -ENOMEM ; - s =strstrip (s); + s =strstrip (buf);while (1 ) { token =strsep (&s,"," );
@@ -1403,7 +1403,7 @@ static int blk_trace_str2mask(const char *str)break ; } } -kfree (s); +kfree (buf);return mask; }
kernel/trace/trace_syscalls.c +1 -1
@@ -1,5 +1,5 @@ +#include <trace/syscall.h> #include <linux/kernel.h> -#include <linux/ftrace.h> #include <asm/syscall.h> #include "trace_output.h"