diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-06-09 12:55:42 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-06-09 12:55:42 +0800 |
| commit | 3b8d7f4db34913c8e2ea0177723784b646f7424e (patch) | |
| tree | 1c28a8a8c273dffd031935f5ee509db5c5e0f386 /kernel/module.c | |
| parent | f669f023e2ce45ab6e289bd980d435e1dae0e362 (diff) | |
| parent | c2f7eb8029e23c4f5445340d8fc0d05367538e6d (diff) | |
Merge tag v3.10.42 into linux-linaro-lsk
This is the 3.10.42 stable release
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/module.c b/kernel/module.c index fa53db8aadeb..10a3af821d28 100644 --- 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) |