summaryrefslogtreecommitdiff
path: root/kernel/trace/trace_event_profile.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-08-15 05:58:45 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-08-15 05:58:45 +0900
commitd2dcd9101b1a940ce8496601ba871e47f84881ec (patch)
tree3de9cb11379d51eb01b568a20c8d7c585c89d10e /kernel/trace/trace_event_profile.c
parent8010fbe7a67c2f993cbb11b9d8b7e98528256dd1 (diff)
parent606b4c992f3b28f906100f1b6eb49059909d8da7 (diff)
Merge branch 'master' into sh/cachetlb
Diffstat (limited to 'kernel/trace/trace_event_profile.c')
-rw-r--r--kernel/trace/trace_event_profile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_event_profile.c b/kernel/trace/trace_event_profile.c
index 5b5895afecfe..11ba5bb4ed0a 100644
--- a/kernel/trace/trace_event_profile.c
+++ b/kernel/trace/trace_event_profile.c
@@ -14,7 +14,7 @@ int ftrace_profile_enable(int event_id)
mutex_lock(&event_mutex);
list_for_each_entry(event, &ftrace_events, list) {
- if (event->id == event_id) {
+ if (event->id == event_id && event->profile_enable) {
ret = event->profile_enable(event);
break;
}