From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [for-next][PATCH 2/8] tracing: Make filter_check_discard() local
Date: Sat, 30 Apr 2016 08:13:44 -0400 [thread overview]
Message-ID: <20160430121410.507118846@goodmis.org> (raw)
In-Reply-To: <20160430121342.397837568@goodmis.org>
[-- Attachment #1: 0002-tracing-Make-filter_check_discard-local.patch --]
[-- Type: text/plain, Size: 2633 bytes --]
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
Nothing outside of the tracing directory calls filter_check_discard() or
check_filter_check_discard(). They should not be called by modules. Move
their prototypes into the local tracing header and remove their
EXPORT_SYMBOL() macros.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
include/linux/trace_events.h | 6 ------
kernel/trace/trace.c | 2 --
kernel/trace/trace.h | 6 ++++++
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 70a181cb3585..bb383af35cc7 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -413,12 +413,6 @@ enum event_trigger_type {
extern int filter_match_preds(struct event_filter *filter, void *rec);
-extern int filter_check_discard(struct trace_event_file *file, void *rec,
- struct ring_buffer *buffer,
- struct ring_buffer_event *event);
-extern int call_filter_check_discard(struct trace_event_call *call, void *rec,
- struct ring_buffer *buffer,
- struct ring_buffer_event *event);
extern enum event_trigger_type event_triggers_call(struct trace_event_file *file,
void *rec);
extern void event_triggers_post_call(struct trace_event_file *file,
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 46028d47d252..02f5a5f51d49 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -318,7 +318,6 @@ int filter_check_discard(struct trace_event_file *file, void *rec,
return 0;
}
-EXPORT_SYMBOL_GPL(filter_check_discard);
int call_filter_check_discard(struct trace_event_call *call, void *rec,
struct ring_buffer *buffer,
@@ -332,7 +331,6 @@ int call_filter_check_discard(struct trace_event_call *call, void *rec,
return 0;
}
-EXPORT_SYMBOL_GPL(call_filter_check_discard);
static cycle_t buffer_ftrace_now(struct trace_buffer *buf, int cpu)
{
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index c0eac7b1e5a6..ee8691c66bfe 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1065,6 +1065,12 @@ struct trace_subsystem_dir {
int nr_events;
};
+extern int filter_check_discard(struct trace_event_file *file, void *rec,
+ struct ring_buffer *buffer,
+ struct ring_buffer_event *event);
+extern int call_filter_check_discard(struct trace_event_call *call, void *rec,
+ struct ring_buffer *buffer,
+ struct ring_buffer_event *event);
/*
* Helper function for event_trigger_unlock_commit{_regs}().
* If there are event triggers attached to this event that requires
--
2.8.0.rc3
next prev parent reply other threads:[~2016-04-30 12:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-30 12:13 [for-next][PATCH 0/8] tracing: Various cleanups Steven Rostedt
2016-04-30 12:13 ` [for-next][PATCH 1/8] tracing: Move event_trigger_unlock_commit{_regs}() to local header Steven Rostedt
2016-04-30 12:13 ` Steven Rostedt [this message]
2016-04-30 12:13 ` [for-next][PATCH 3/8] tracing: Fold filter_check_discard() into its only user Steven Rostedt
2016-04-30 12:13 ` [for-next][PATCH 4/8] tracing: Move trace_buffer_unlock_commit{_regs}() to local header Steven Rostedt
2016-04-30 12:13 ` [for-next][PATCH 5/8] tracing: Remove unused function trace_current_buffer_discard_commit() Steven Rostedt
2016-04-30 12:13 ` [for-next][PATCH 6/8] tracing: Have trace_buffer_unlock_commit() call the _regs version with NULL Steven Rostedt
2016-04-30 12:13 ` [for-next][PATCH 7/8] tracing: Remove one use of trace_current_buffer_lock_reserve() Steven Rostedt
2016-04-30 12:13 ` [for-next][PATCH 8/8] tracing: Remove unused function trace_current_buffer_lock_reserve() Steven Rostedt
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=20160430121410.507118846@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.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
Powered by JetHome