git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'linus/master' into tracing/kprobes
[pandora-kernel.git]
/
include
/
trace
/
ftrace.h
diff --git
a/include/trace/ftrace.h
b/include/trace/ftrace.h
index
cc0d966
..
54d02c0
100644
(file)
--- a/
include/trace/ftrace.h
+++ b/
include/trace/ftrace.h
@@
-399,12
+399,12
@@
static inline int ftrace_get_offsets_##call( \
\
static void ftrace_profile_##call(proto); \
\
\
static void ftrace_profile_##call(proto); \
\
-static int ftrace_profile_enable_##call(
void)
\
+static int ftrace_profile_enable_##call(
struct ftrace_event_call *unused)
\
{ \
return register_trace_##call(ftrace_profile_##call); \
} \
\
{ \
return register_trace_##call(ftrace_profile_##call); \
} \
\
-static void ftrace_profile_disable_##call(
void)
\
+static void ftrace_profile_disable_##call(
struct ftrace_event_call *unused)
\
{ \
unregister_trace_##call(ftrace_profile_##call); \
}
{ \
unregister_trace_##call(ftrace_profile_##call); \
}
@@
-423,7
+423,7
@@
static void ftrace_profile_disable_##call(void) \
* event_trace_printk(_RET_IP_, "<call>: " <fmt>);
* }
*
* event_trace_printk(_RET_IP_, "<call>: " <fmt>);
* }
*
- * static int ftrace_reg_event_<call>(
voi
d)
+ * static int ftrace_reg_event_<call>(
struct ftrace_event_call *unuse
d)
* {
* int ret;
*
* {
* int ret;
*
@@
-434,7
+434,7
@@
static void ftrace_profile_disable_##call(void) \
* return ret;
* }
*
* return ret;
* }
*
- * static void ftrace_unreg_event_<call>(
voi
d)
+ * static void ftrace_unreg_event_<call>(
struct ftrace_event_call *unuse
d)
* {
* unregister_trace_<call>(ftrace_event_<call>);
* }
* {
* unregister_trace_<call>(ftrace_event_<call>);
* }
@@
-469,7
+469,7
@@
static void ftrace_profile_disable_##call(void) \
* trace_current_buffer_unlock_commit(buffer, event, irq_flags, pc);
* }
*
* trace_current_buffer_unlock_commit(buffer, event, irq_flags, pc);
* }
*
- * static int ftrace_raw_reg_event_<call>(
voi
d)
+ * static int ftrace_raw_reg_event_<call>(
struct ftrace_event_call *unuse
d)
* {
* int ret;
*
* {
* int ret;
*
@@
-480,7
+480,7
@@
static void ftrace_profile_disable_##call(void) \
* return ret;
* }
*
* return ret;
* }
*
- * static void ftrace_unreg_event_<call>(
voi
d)
+ * static void ftrace_unreg_event_<call>(
struct ftrace_event_call *unuse
d)
* {
* unregister_trace_<call>(ftrace_raw_event_<call>);
* }
* {
* unregister_trace_<call>(ftrace_raw_event_<call>);
* }
@@
-489,7
+489,7
@@
static void ftrace_profile_disable_##call(void) \
* .trace = ftrace_raw_output_<call>, <-- stage 2
* };
*
* .trace = ftrace_raw_output_<call>, <-- stage 2
* };
*
- * static int ftrace_raw_init_event_<call>(
voi
d)
+ * static int ftrace_raw_init_event_<call>(
struct ftrace_event_call *unuse
d)
* {
* int id;
*
* {
* int id;
*
@@
-586,7
+586,7
@@
static void ftrace_raw_event_##call(proto) \
event, irq_flags, pc); \
} \
\
event, irq_flags, pc); \
} \
\
-static int ftrace_raw_reg_event_##call(
void *ptr)
\
+static int ftrace_raw_reg_event_##call(
struct ftrace_event_call *unused)
\
{ \
int ret; \
\
{ \
int ret; \
\
@@
-597,7
+597,7
@@
static int ftrace_raw_reg_event_##call(void *ptr) \
return ret; \
} \
\
return ret; \
} \
\
-static void ftrace_raw_unreg_event_##call(
void *ptr)
\
+static void ftrace_raw_unreg_event_##call(
struct ftrace_event_call *unused)
\
{ \
unregister_trace_##call(ftrace_raw_event_##call); \
} \
{ \
unregister_trace_##call(ftrace_raw_event_##call); \
} \
@@
-606,7
+606,7
@@
static struct trace_event ftrace_event_type_##call = { \
.trace = ftrace_raw_output_##call, \
}; \
\
.trace = ftrace_raw_output_##call, \
}; \
\
-static int ftrace_raw_init_event_##call(
void)
\
+static int ftrace_raw_init_event_##call(
struct ftrace_event_call *unused)
\
{ \
int id; \
\
{ \
int id; \
\