projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[deliverable/linux.git]
/
kernel
/
trace
/
trace_events.c
diff --git
a/kernel/trace/trace_events.c
b/kernel/trace/trace_events.c
index 35fde09b81dee7f386c111766b1fdbefac2d7414..5f499e0438a4f9137b66055331cb8c3b048138ed 100644
(file)
--- a/
kernel/trace/trace_events.c
+++ b/
kernel/trace/trace_events.c
@@
-1284,7
+1284,7
@@
trace_create_file_ops(struct module *mod)
static void trace_module_add_events(struct module *mod)
{
struct ftrace_module_file_ops *file_ops = NULL;
static void trace_module_add_events(struct module *mod)
{
struct ftrace_module_file_ops *file_ops = NULL;
- struct ftrace_event_call *
call, *start,
*end;
+ struct ftrace_event_call *
*call, **start, *
*end;
start = mod->trace_events;
end = mod->trace_events + mod->num_trace_events;
start = mod->trace_events;
end = mod->trace_events + mod->num_trace_events;
@@
-1297,7
+1297,7
@@
static void trace_module_add_events(struct module *mod)
return;
for_each_event(call, start, end) {
return;
for_each_event(call, start, end) {
- __trace_add_event_call(call, mod,
+ __trace_add_event_call(
*
call, mod,
&file_ops->id, &file_ops->enable,
&file_ops->filter, &file_ops->format);
}
&file_ops->id, &file_ops->enable,
&file_ops->filter, &file_ops->format);
}
@@
-1367,8
+1367,8
@@
static struct notifier_block trace_module_nb = {
.priority = 0,
};
.priority = 0,
};
-extern struct ftrace_event_call __start_ftrace_events[];
-extern struct ftrace_event_call __stop_ftrace_events[];
+extern struct ftrace_event_call
*
__start_ftrace_events[];
+extern struct ftrace_event_call
*
__stop_ftrace_events[];
static char bootup_event_buf[COMMAND_LINE_SIZE] __initdata;
static char bootup_event_buf[COMMAND_LINE_SIZE] __initdata;
@@
-1384,7
+1384,7
@@
__setup("trace_event=", setup_trace_event);
static __init int event_trace_init(void)
{
static __init int event_trace_init(void)
{
- struct ftrace_event_call *call;
+ struct ftrace_event_call *
*
call;
struct dentry *d_tracer;
struct dentry *entry;
struct dentry *d_events;
struct dentry *d_tracer;
struct dentry *entry;
struct dentry *d_events;
@@
-1430,7
+1430,7
@@
static __init int event_trace_init(void)
pr_warning("tracing: Failed to allocate common fields");
for_each_event(call, __start_ftrace_events, __stop_ftrace_events) {
pr_warning("tracing: Failed to allocate common fields");
for_each_event(call, __start_ftrace_events, __stop_ftrace_events) {
- __trace_add_event_call(call, NULL, &ftrace_event_id_fops,
+ __trace_add_event_call(
*
call, NULL, &ftrace_event_id_fops,
&ftrace_enable_fops,
&ftrace_event_filter_fops,
&ftrace_event_format_fops);
&ftrace_enable_fops,
&ftrace_event_filter_fops,
&ftrace_event_format_fops);
This page took
0.027131 seconds
and
5
git commands to generate.