diff options
Diffstat (limited to 'kernel/trace/trace_events.c')
| -rw-r--r-- | kernel/trace/trace_events.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index d128f65778e6..5e9ffc33f6db 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c | |||
| @@ -878,9 +878,9 @@ event_subsystem_dir(const char *name, struct dentry *d_events) | |||
| 878 | "'%s/filter' entry\n", name); | 878 | "'%s/filter' entry\n", name); |
| 879 | } | 879 | } |
| 880 | 880 | ||
| 881 | entry = trace_create_file("enable", 0644, system->entry, | 881 | trace_create_file("enable", 0644, system->entry, |
| 882 | (void *)system->name, | 882 | (void *)system->name, |
| 883 | &ftrace_system_enable_fops); | 883 | &ftrace_system_enable_fops); |
| 884 | 884 | ||
| 885 | return system->entry; | 885 | return system->entry; |
| 886 | } | 886 | } |
| @@ -892,7 +892,6 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, | |||
| 892 | const struct file_operations *filter, | 892 | const struct file_operations *filter, |
| 893 | const struct file_operations *format) | 893 | const struct file_operations *format) |
| 894 | { | 894 | { |
| 895 | struct dentry *entry; | ||
| 896 | int ret; | 895 | int ret; |
| 897 | 896 | ||
| 898 | /* | 897 | /* |
| @@ -910,12 +909,12 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, | |||
| 910 | } | 909 | } |
| 911 | 910 | ||
| 912 | if (call->regfunc) | 911 | if (call->regfunc) |
| 913 | entry = trace_create_file("enable", 0644, call->dir, call, | 912 | trace_create_file("enable", 0644, call->dir, call, |
| 914 | enable); | 913 | enable); |
| 915 | 914 | ||
| 916 | if (call->id && call->profile_enable) | 915 | if (call->id && call->profile_enable) |
| 917 | entry = trace_create_file("id", 0444, call->dir, call, | 916 | trace_create_file("id", 0444, call->dir, call, |
| 918 | id); | 917 | id); |
| 919 | 918 | ||
| 920 | if (call->define_fields) { | 919 | if (call->define_fields) { |
| 921 | ret = call->define_fields(call); | 920 | ret = call->define_fields(call); |
| @@ -924,16 +923,16 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, | |||
| 924 | " events/%s\n", call->name); | 923 | " events/%s\n", call->name); |
| 925 | return ret; | 924 | return ret; |
| 926 | } | 925 | } |
| 927 | entry = trace_create_file("filter", 0644, call->dir, call, | 926 | trace_create_file("filter", 0644, call->dir, call, |
| 928 | filter); | 927 | filter); |
| 929 | } | 928 | } |
| 930 | 929 | ||
| 931 | /* A trace may not want to export its format */ | 930 | /* A trace may not want to export its format */ |
| 932 | if (!call->show_format) | 931 | if (!call->show_format) |
| 933 | return 0; | 932 | return 0; |
| 934 | 933 | ||
| 935 | entry = trace_create_file("format", 0444, call->dir, call, | 934 | trace_create_file("format", 0444, call->dir, call, |
| 936 | format); | 935 | format); |
| 937 | 936 | ||
| 938 | return 0; | 937 | return 0; |
| 939 | } | 938 | } |