diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-09-29 14:21:21 +0200 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-09-29 14:21:21 +0200 |
commit | e7d244374389586bfe6fa31be6403f656c2569a3 (patch) | |
tree | 449ced06a706bc0495a88859a6660e90b2f06aef /target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch | |
parent | 067545b37459056e9812c4a11c4a60aa9d04c891 (diff) | |
download | upstream-e7d244374389586bfe6fa31be6403f656c2569a3.tar.gz upstream-e7d244374389586bfe6fa31be6403f656c2569a3.tar.bz2 upstream-e7d244374389586bfe6fa31be6403f656c2569a3.zip |
CC: kernel: update kernel 3.18 to version 3.18.36
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch b/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch index a6310c625c..2e66de29df 100644 --- a/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch +++ b/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch @@ -145,7 +145,7 @@ Origin: backport, https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.gi #endif --- a/kernel/module.c +++ b/kernel/module.c -@@ -1837,6 +1837,10 @@ void __weak module_arch_cleanup(struct m +@@ -1840,6 +1840,10 @@ void __weak module_arch_cleanup(struct m { } @@ -156,7 +156,7 @@ Origin: backport, https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.gi /* Free a module, remove from lists, etc. */ static void free_module(struct module *mod) { -@@ -1869,6 +1873,7 @@ static void free_module(struct module *m +@@ -1872,6 +1876,7 @@ static void free_module(struct module *m /* This may be NULL, but that's OK */ unset_module_init_ro_nx(mod); @@ -164,7 +164,7 @@ Origin: backport, https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.gi module_free(mod, mod->module_init); kfree(mod->args); percpu_modfree(mod); -@@ -2958,6 +2963,7 @@ static struct module *layout_and_allocat +@@ -2978,6 +2983,7 @@ static struct module *layout_and_allocat static void module_deallocate(struct module *mod, struct load_info *info) { percpu_modfree(mod); @@ -172,8 +172,8 @@ Origin: backport, https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.gi module_free(mod, mod->module_init); module_free(mod, mod->module_core); } -@@ -3081,6 +3087,7 @@ static int do_init_module(struct module - mod->strtab = mod->core_strtab; +@@ -3100,6 +3106,7 @@ static int do_init_module(struct module + rcu_assign_pointer(mod->kallsyms, &mod->core_kallsyms); #endif unset_module_init_ro_nx(mod); + module_arch_freeing_init(mod); |