diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 19:19:40 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 19:19:40 +0200 |
commit | 987aec39a74373c55c3bedd5c3c83896d78fd0a2 (patch) | |
tree | 66aba6d4f166f269be95fe4d267d57efe533aefd /kernel/module.c | |
parent | firmware: add missing kfree for work on async call (diff) | |
parent | Linux 4.1-rc7 (diff) | |
download | linux-987aec39a74373c55c3bedd5c3c83896d78fd0a2.tar.xz linux-987aec39a74373c55c3bedd5c3c83896d78fd0a2.zip |
Merge 4.1-rc7 into driver-core-next
We want the fixes in this branch as well for testing and merge
resolution.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 ea941bc327d5..869e9d60f424 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3380,6 +3380,9 @@ static int load_module(struct load_info *info, const char __user *uargs, module_bug_cleanup(mod); mutex_unlock(&module_mutex); + blocking_notifier_call_chain(&module_notify_list, + MODULE_STATE_GOING, mod); + /* we can't deallocate the module until we clear memory protection */ unset_module_init_ro_nx(mod); unset_module_core_ro_nx(mod); |