mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Frederic Weisbecker <fweisbec@gmail.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Lai Jiangshan <laijs@cn.fujitsu.com>,
	Li Zefan <lizf@cn.fujitsu.com>,
	Steven Rostedt <rostedt@goodmis.org>
Subject: [PATCH 7/7] tracing/events: Only define remove_subsystem_dir() if CONFIG_MODULES
Date: Thu,  6 Aug 2009 08:27:38 +0200	[thread overview]
Message-ID: <1249540058-5528-8-git-send-email-fweisbec@gmail.com> (raw)
In-Reply-To: <20090802195312.GA18598@elte.hu>

If we disable modules, we get the following warning in ftrace events
file:

kernel/trace/trace_events.c:912: attention : ‘remove_subsystem_dir’ defined but not used

remove_subystem_dir() is useless if !CONFIG_MODULES, then move it to
the appropriate #ifdef section of trace_events.c

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
---
 kernel/trace/trace_events.c |   52 +++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 90cf936..70ecb76 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -908,32 +908,6 @@ event_subsystem_dir(const char *name, struct dentry *d_events)
 	return system->entry;
 }
 
-static void remove_subsystem_dir(const char *name)
-{
-	struct event_subsystem *system;
-
-	if (strcmp(name, TRACE_SYSTEM) == 0)
-		return;
-
-	list_for_each_entry(system, &event_subsystems, list) {
-		if (strcmp(system->name, name) == 0) {
-			if (!--system->nr_events) {
-				struct event_filter *filter = system->filter;
-
-				debugfs_remove_recursive(system->entry);
-				list_del(&system->list);
-				if (filter) {
-					kfree(filter->filter_string);
-					kfree(filter);
-				}
-				kfree(system->name);
-				kfree(system);
-			}
-			break;
-		}
-	}
-}
-
 static int
 event_create_dir(struct ftrace_event_call *call, struct dentry *d_events,
 		 const struct file_operations *id,
@@ -1018,6 +992,32 @@ struct ftrace_module_file_ops {
 	struct file_operations		filter;
 };
 
+static void remove_subsystem_dir(const char *name)
+{
+	struct event_subsystem *system;
+
+	if (strcmp(name, TRACE_SYSTEM) == 0)
+		return;
+
+	list_for_each_entry(system, &event_subsystems, list) {
+		if (strcmp(system->name, name) == 0) {
+			if (!--system->nr_events) {
+				struct event_filter *filter = system->filter;
+
+				debugfs_remove_recursive(system->entry);
+				list_del(&system->list);
+				if (filter) {
+					kfree(filter->filter_string);
+					kfree(filter);
+				}
+				kfree(system->name);
+				kfree(system);
+			}
+			break;
+		}
+	}
+}
+
 static struct ftrace_module_file_ops *
 trace_create_file_ops(struct module *mod)
 {
-- 
1.6.2.3


      parent reply	other threads:[~2009-08-06  6:28 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-29 17:13 [GIT PULL] tracing: Various cleanups for 2.6.32 Frederic Weisbecker
2009-07-29 17:13 ` [PATCH 1/6] tracing: Simplify print_graph_cpu() Frederic Weisbecker
2009-07-29 17:13 ` [PATCH 2/6] tracing/function-graph-tracer: Drop the useless nmi protection Frederic Weisbecker
2009-07-29 17:13 ` [PATCH 3/6] tracing/function-tracer: Move trace_function() in the function tracer file Frederic Weisbecker
2009-07-29 17:13 ` [PATCH 4/6] tracing/core: Make the stack entry helpers global Frederic Weisbecker
2009-07-29 17:13 ` [PATCH 5/6] tracing: Move sched event insertion helpers in the sched switch tracer file Frederic Weisbecker
2009-07-29 17:13 ` [PATCH 6/6] tracing/function-graph-tracer: Move graph event insertion helpers in the graph " Frederic Weisbecker
2009-07-30  1:48 ` [GIT PULL] tracing: Various cleanups for 2.6.32 Li Zefan
2009-07-30 13:00 ` Steven Rostedt
2009-08-02 19:34 ` Ingo Molnar
2009-08-02 19:53   ` Ingo Molnar
2009-08-03  1:18     ` Frédéric Weisbecker
2009-08-06  6:27     ` [GIT PULL] tracing: Various cleanups for 2.6.32, v2 Frederic Weisbecker
2009-08-06 12:24       ` Ingo Molnar
2009-08-06  6:27     ` [PATCH 1/7] tracing: Simplify print_graph_cpu() Frederic Weisbecker
2009-08-06  6:27     ` [PATCH 2/7] tracing/function-graph-tracer: Drop the useless nmi protection Frederic Weisbecker
2009-08-06  6:27     ` [PATCH 3/7] tracing/core: Turn ftrace_cpu_disabled into a global var Frederic Weisbecker
2009-08-06  6:27     ` [PATCH 4/7] tracing/core: Make the stack entry helpers global Frederic Weisbecker
2009-08-06  6:27     ` [PATCH 5/7] tracing: Move sched event insertion helpers in the sched switch tracer file Frederic Weisbecker
2009-08-06  6:27     ` [PATCH 6/7] tracing/function-graph-tracer: Move graph event insertion helpers in the graph " Frederic Weisbecker
2009-08-06  6:27     ` Frederic Weisbecker [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1249540058-5528-8-git-send-email-fweisbec@gmail.com \
    --to=fweisbec@gmail.com \
    --cc=laijs@cn.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizf@cn.fujitsu.com \
    --cc=mingo@elte.hu \
    --cc=rostedt@goodmis.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®