diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-29 14:24:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-29 14:24:28 -0400 |
commit | 6e49ba1bb1deddd2da806284a37e7f3d3d711301 (patch) | |
tree | aa707aa3140bd7dc1853051c1c1a7bd9d280ebd4 /kernel | |
parent | d0af69886656a93a8c4e9b5bb8f1894a50cf2d8a (diff) | |
parent | f36963c9d3f6f415732710da3acdd8608a9fa0e5 (diff) |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull fixes for cpumask and modules from Rusty Russell:
"** NOW WITH TESTING! **
Two fixes which got lost in my recent distraction. One is a weird
cpumask function which needed to be rewritten, the other is a module
bug which is cc:stable"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
cpumask_set_cpu_local_first => cpumask_local_spread, lament
module: Call module notifier on failure after complete_formation()
Diffstat (limited to 'kernel')
-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 42a1d2afb217..cfc9e843a924 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -3370,6 +3370,9 @@ static int load_module(struct load_info *info, const char __user *uargs, | |||
3370 | module_bug_cleanup(mod); | 3370 | module_bug_cleanup(mod); |
3371 | mutex_unlock(&module_mutex); | 3371 | mutex_unlock(&module_mutex); |
3372 | 3372 | ||
3373 | blocking_notifier_call_chain(&module_notify_list, | ||
3374 | MODULE_STATE_GOING, mod); | ||
3375 | |||
3373 | /* we can't deallocate the module until we clear memory protection */ | 3376 | /* we can't deallocate the module until we clear memory protection */ |
3374 | unset_module_init_ro_nx(mod); | 3377 | unset_module_init_ro_nx(mod); |
3375 | unset_module_core_ro_nx(mod); | 3378 | unset_module_core_ro_nx(mod); |