---

yaml --- r: 269067 b: refs/heads/master c: 3f78f93 h: refs/heads/master i: 269065: 0579371 269063: 00eb1f5 v: v3
git-mirror · Aug 19, 2011 · fa741e6 · fa741e6
1 parent f7d6e8a
commit fa741e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61aaef55300088e12d7f853adeea65d1aa1562db
+refs/heads/master: 3f78f935e7fec3067b7990f9e4d324e1de70f79c
diff --git a/trunk/kernel/trace/trace_events_filter.c b/trunk/kernel/trace/trace_events_filter.c
@@ -1894,17 +1894,14 @@ int ftrace_profile_set_filter(struct perf_event *event, int event_id,
 	int err;
 	struct event_filter *filter;
 	struct filter_parse_state *ps;
-	struct ftrace_event_call *call = NULL;
+	struct ftrace_event_call *call;
 
 	mutex_lock(&event_mutex);
 
-	list_for_each_entry(call, &ftrace_events, list) {
-		if (call->event.type == event_id)
-			break;
-	}
+	call = event->tp_event;
 
 	err = -EINVAL;
-	if (&call->list == &ftrace_events)
+	if (!call)
 		goto out_unlock;
 
 	err = -EEXIST;