summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2017-06-20 10:44:58 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2017-10-04 14:20:52 -0400
commit6cafbe159416822f6d3dfd711bf4c39050c650ba (patch)
tree65cde074656c11c0019402a1d17044f6fa22797b /kernel/trace
parent5819eaddf35b24d628ddfa4fbb5f8d4026e44b96 (diff)
downloadlinux-stable-6cafbe159416822f6d3dfd711bf4c39050c650ba.tar.gz
linux-stable-6cafbe159416822f6d3dfd711bf4c39050c650ba.tar.bz2
linux-stable-6cafbe159416822f6d3dfd711bf4c39050c650ba.zip
ftrace: Add a ftrace_free_mem() function for modules to use
In order to be able to trace module init functions, the module code needs to tell ftrace what is being freed when the init sections are freed. Use the code that the main init calls to tell ftrace to free the main init sections. This requires passing in a start and end address to free. Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/ftrace.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 6abfafd7f173..84cb5928665a 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -5868,10 +5868,10 @@ void ftrace_module_init(struct module *mod)
}
#endif /* CONFIG_MODULES */
-void __init ftrace_free_init_mem(void)
+void ftrace_free_mem(void *start_ptr, void *end_ptr)
{
- unsigned long start = (unsigned long)(&__init_begin);
- unsigned long end = (unsigned long)(&__init_end);
+ unsigned long start = (unsigned long)(start_ptr);
+ unsigned long end = (unsigned long)(end_ptr);
struct ftrace_page **last_pg = &ftrace_pages_start;
struct ftrace_page *pg;
struct dyn_ftrace *rec;
@@ -5913,6 +5913,14 @@ void __init ftrace_free_init_mem(void)
mutex_unlock(&ftrace_lock);
}
+void __init ftrace_free_init_mem(void)
+{
+ void *start = (void *)(&__init_begin);
+ void *end = (void *)(&__init_end);
+
+ ftrace_free_mem(start, end);
+}
+
void __init ftrace_init(void)
{
extern unsigned long __start_mcount_loc[];