Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index fa53db8aadeb2dea6320d1987f0f775e35e480a4..10a3af821d2863c105a43e4ab3dc9be34615a15f 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3279,6 +3279,9 @@ static int load_module(struct load_info *info, const char __user *uargs,
 
        dynamic_debug_setup(info->debug, info->num_debug);
 
+       /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
+       ftrace_module_init(mod);
+
        /* Finally it's fully formed, ready to start executing. */
        err = complete_formation(mod, info);
        if (err)