projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update kernel 3.18 to version 3.18.43
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
patches-3.18
/
099-module_arch_freeing_init-new-hook-for-archs-before-m.patch
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 a6310c625c24bcfcfaffbea046b77ae214868d7c..352bf6de157a951a2b088f684f21d60894acfdbb 100644
(file)
--- 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
#endif
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -18
37,6 +1837
,10 @@ void __weak module_arch_cleanup(struct m
+@@ -18
40,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)
{
/* Free a module, remove from lists, etc. */
static void free_module(struct module *mod)
{
-@@ -18
69,6 +1873
,7 @@ static void free_module(struct module *m
+@@ -18
72,6 +1876
,7 @@ static void free_module(struct module *m
/* This may be NULL, but that's OK */
unset_module_init_ro_nx(mod);
/* 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);
module_free(mod, mod->module_init);
kfree(mod->args);
percpu_modfree(mod);
-@@ -29
58,6 +2963
,7 @@ static struct module *layout_and_allocat
+@@ -29
83,6 +2988
,7 @@ static struct module *layout_and_allocat
static void module_deallocate(struct module *mod, struct load_info *info)
{
percpu_modfree(mod);
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);
}
module_free(mod, mod->module_init);
module_free(mod, mod->module_core);
}
-@@ -3
081,6 +3087
,7 @@ static int do_init_module(struct module
-
mod->strtab = mod->core_strtab
;
+@@ -3
105,6 +3111
,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);
#endif
unset_module_init_ro_nx(mod);
+ module_arch_freeing_init(mod);