From 7f477f1456feb26b5b8d724c6d7b6b05162b36e4 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Tue, 10 Mar 2009 11:32:40 -0400 Subject: [PATCH] --- yaml --- r: 140909 b: refs/heads/master c: 40e26815fafd3b8c4aced17b1f22e68ef33eb8db h: refs/heads/master i: 140907: 7f397c5ceda375ae76bf4d422c91974b43ee9133 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_events.c | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a0ba9a5895cc..9dc3765626fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce8eb2bf05042452107e489782105d2e235cbdd0 +refs/heads/master: 40e26815fafd3b8c4aced17b1f22e68ef33eb8db diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c index a0b41cc26f26..85ec10fbb38d 100644 --- a/trunk/kernel/trace/trace_events.c +++ b/trunk/kernel/trace/trace_events.c @@ -102,7 +102,7 @@ static int ftrace_set_clr_event(char *buf, int set) mutex_lock(&event_mutex); events_for_each(call) { - if (!call->name) + if (!call->name || !call->regfunc) continue; if (match && @@ -207,8 +207,20 @@ t_next(struct seq_file *m, void *v, loff_t *pos) (*pos)++; - if ((unsigned long)call >= (unsigned long)__stop_ftrace_events) - return NULL; + for (;;) { + if ((unsigned long)call >= (unsigned long)__stop_ftrace_events) + return NULL; + + /* + * The ftrace subsystem is for showing formats only. + * They can not be enabled or disabled via the event files. + */ + if (call->regfunc) + break; + + call++; + next = call; + } m->private = ++next;