diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2016-01-12 20:53:04 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2016-01-12 20:53:04 +0000 |
| commit | 4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6 (patch) | |
| tree | 3f4aeaef7819851a11f87cd003d7e02fe17c9189 /target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch | |
| parent | 50ff51e118b8c1dc098fd2d26d2235bd1add458c (diff) | |
| download | master-187ad058-4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6.tar.gz master-187ad058-4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6.tar.bz2 master-187ad058-4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6.zip | |
kernel/3.18: update to version 3.18.25
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48225 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 | 8 |
1 files changed, 4 insertions, 4 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 d00f751cdc..a6310c625c 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 -@@ -1833,6 +1833,10 @@ void __weak module_arch_cleanup(struct m +@@ -1837,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) { -@@ -1865,6 +1869,7 @@ static void free_module(struct module *m +@@ -1869,6 +1873,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); -@@ -2954,6 +2959,7 @@ static struct module *layout_and_allocat +@@ -2958,6 +2963,7 @@ static struct module *layout_and_allocat 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); } -@@ -3077,6 +3083,7 @@ static int do_init_module(struct module +@@ -3081,6 +3087,7 @@ static int do_init_module(struct module mod->strtab = mod->core_strtab; #endif unset_module_init_ro_nx(mod); |