Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1297886
| From | Steven Rostedt <rostedt@goodmis.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [for-next][PATCH 09/13] ftrace: Clean up ftrace_module_init() code |
| Date | 2015-12-24 15:40 +0100 |
| Message-ID | <qJfdD-7VC-15@gated-at.bofh.it> (permalink) |
| References | <qJf3Y-7QW-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
The start and end variables were only used when ftrace_module_init() was
split up into multiple functions. No need to keep them around after the
merger.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/ftrace.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 29fcc2c76583..0f7ee341f89f 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -4982,14 +4982,11 @@ void ftrace_release_mod(struct module *mod)
void ftrace_module_init(struct module *mod)
{
- unsigned long *start = mod->ftrace_callsites;
- unsigned long *end = mod->ftrace_callsites +
- mod->num_ftrace_callsites;
-
- if (ftrace_disabled || start == end)
+ if (ftrace_disabled || !mod->num_ftrace_callsites)
return;
- ftrace_process_locs(mod, start, end);
+ ftrace_process_locs(mod, mod->ftrace_callsites,
+ mod->ftrace_callsites + mod->num_ftrace_callsites);
}
static int ftrace_module_notify_exit(struct notifier_block *self,
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[for-next][PATCH 00/13] tracing: More updates for 4.5. Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 06/13] tracing: Use seq_buf_used() in seq_buf_to_user() instead of len Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 01/13] ftrace: Fix a typo in comment Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 12/13] metag: ftrace: Fix the comments for ftrace_modify_code Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 03/13] ftrace: Remove use of control list and ops Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 07/13] tracing: Introduce TRACE_EVENT_FN_COND macro Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 04/13] ftrace: Have ftrace_ops_get_func() handle RCU and PER_CPU flags too Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 13/13] tracing: Fix comment to use tracing_on over tracing_enable Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 09/13] ftrace: Clean up ftrace_module_init() code Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 10/13] ia64: ftrace: Fix the comments for ftrace_modify_code() Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100 [for-next][PATCH 02/13] ftrace: Fix output of enabled_functions for showing tramp Steven Rostedt <rostedt@goodmis.org> - 2015-12-24 15:40 +0100
csiph-web