projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel/3.18: update to version 3.18.25
[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
d00f751
..
a6310c6
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
-@@ -183
3,6 +1833
,10 @@ void __weak module_arch_cleanup(struct m
+@@ -183
7,6 +1837
,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)
{
-@@ -186
5,6 +1869
,7 @@ static void free_module(struct module *m
+@@ -186
9,6 +1873
,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);
-@@ -295
4,6 +2959
,7 @@ static struct module *layout_and_allocat
+@@ -295
8,6 +2963
,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,7
+172,7
@@
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);
}
-@@ -30
77,6 +3083
,7 @@ static int do_init_module(struct module
+@@ -30
81,6 +3087
,7 @@ static int do_init_module(struct module
mod->strtab = mod->core_strtab;
#endif
unset_module_init_ro_nx(mod);
mod->strtab = mod->core_strtab;
#endif
unset_module_init_ro_nx(mod);