diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-12 10:20:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-12 10:20:59 +0100 |
| commit | 937779db13fb6cb621e28d9ae0a6cf1d05b57d05 (patch) | |
| tree | 6c27402677c347c4dc01980de78c270630588847 /kernel/trace/trace_events.c | |
| parent | 6230f2c7ef01a69e2ba9370326572c287209d32a (diff) | |
| parent | 9f591fd76afdc0e5192e9ed00a36f8efc0b4dfe6 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_events.c')
| -rw-r--r-- | kernel/trace/trace_events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 3f972ad98d0..beab8bf2f31 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -938,7 +938,7 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, trace_create_file("enable", 0644, call->dir, call, enable); - if (call->id && call->profile_enable) + if (call->id && call->perf_event_enable) trace_create_file("id", 0444, call->dir, call, id); |