Merge branches 'tracing/ftrace', 'tracing/syscalls' and 'linus' into tracing/core

Conflicts:
	arch/parisc/kernel/irq.c
This commit is contained in:
Ingo Molnar
2009-03-16 09:12:42 +01:00
163 changed files with 4853 additions and 2122 deletions

View File

@@ -505,13 +505,21 @@ static inline void trace_hw_branch_oops(void) {}
/*
* A syscall entry in the ftrace syscalls array.
*
* @syscall_nr: syscall number
* @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_trace_entry {
int syscall_nr;
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);