Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / kernel / trace / trace_event_profile.c

diff --git a/kernel/trace/trace_event_profile.c b/kernel/trace/trace_event_profile.c
index 11ba5bb4ed0a71f0c3da5e8a2ce73471456aec47..55a25c933d159d5a289265e604d608d96277e63c 100644 (file)
--- a/kernel/trace/trace_event_profile.c
+++ b/kernel/trace/trace_event_profile.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <linux/module.h>
 #include "trace.h"
 
 int ftrace_profile_enable(int event_id)
@@ -14,7 +15,8 @@ int ftrace_profile_enable(int event_id)
 
        mutex_lock(&event_mutex);
        list_for_each_entry(event, &ftrace_events, list) {
-               if (event->id == event_id && event->profile_enable) {
+               if (event->id == event_id && event->profile_enable &&
+                   try_module_get(event->mod)) {
                        ret = event->profile_enable(event);
                        break;
                }
@@ -32,6 +34,7 @@ void ftrace_profile_disable(int event_id)
        list_for_each_entry(event, &ftrace_events, list) {
                if (event->id == event_id) {
                        event->profile_disable(event);
+                       module_put(event->mod);
                        break;
                }
        }