git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysctl: remove "struct file *" argument of ->proc_handler
[safe/jmp/linux-2.6]
/
include
/
linux
/
ftrace.h
diff --git
a/include/linux/ftrace.h
b/include/linux/ftrace.h
index
39b95c5
..
cd3d2ab
100644
(file)
--- a/
include/linux/ftrace.h
+++ b/
include/linux/ftrace.h
@@
-19,7
+19,7
@@
extern int ftrace_enabled;
extern int
ftrace_enable_sysctl(struct ctl_table *table, int write,
extern int ftrace_enabled;
extern int
ftrace_enable_sysctl(struct ctl_table *table, int write,
-
struct file *filp,
void __user *buffer, size_t *lenp,
+ void __user *buffer, size_t *lenp,
loff_t *ppos);
typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip);
loff_t *ppos);
typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip);
@@
-94,7
+94,7
@@
static inline void ftrace_start(void) { }
extern int stack_tracer_enabled;
int
stack_trace_sysctl(struct ctl_table *table, int write,
extern int stack_tracer_enabled;
int
stack_trace_sysctl(struct ctl_table *table, int write,
-
struct file *file,
void __user *buffer, size_t *lenp,
+ void __user *buffer, size_t *lenp,
loff_t *ppos);
#endif
loff_t *ppos);
#endif
@@
-362,6
+362,7
@@
struct ftrace_ret_stack {
unsigned long func;
unsigned long long calltime;
unsigned long long subtime;
unsigned long func;
unsigned long long calltime;
unsigned long long subtime;
+ unsigned long fp;
};
/*
};
/*
@@
-372,7
+373,8
@@
struct ftrace_ret_stack {
extern void return_to_handler(void);
extern int
extern void return_to_handler(void);
extern int
-ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth);
+ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
+ unsigned long frame_pointer);
/*
* Sometimes we don't want to trace a function with the function
/*
* Sometimes we don't want to trace a function with the function
@@
-444,7
+446,6
@@
static inline void unpause_graph_tracing(void) { }
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
#ifdef CONFIG_TRACING
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
#ifdef CONFIG_TRACING
-#include <linux/sched.h>
/* flags for current->trace */
enum {
/* flags for current->trace */
enum {