Author: kaloz
Date: 2015-10-08 11:17:08 +0200 (Thu, 08 Oct 2015)
New Revision: 47163

Modified:
   
branches/chaos_calmer/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch
   
branches/chaos_calmer/target/linux/generic/patches-3.18/204-module_strip.patch
Log:
generic/3.18: refresh patches

Signed-off-by: Imre Kaloz <[email protected]>


Modified: 
branches/chaos_calmer/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch
===================================================================
--- 
branches/chaos_calmer/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch
      2015-10-07 22:20:55 UTC (rev 47162)
+++ 
branches/chaos_calmer/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch
      2015-10-08 09:17:08 UTC (rev 47163)
@@ -122,7 +122,7 @@
 +      mod->arch.syminfo = NULL;
  }
  
- static void
+ static void check_rela(Elf_Rela *rela, struct module *me)
 --- a/arch/tile/kernel/module.c
 +++ b/arch/tile/kernel/module.c
 @@ -83,7 +83,7 @@ void module_free(struct module *mod, voi
@@ -136,7 +136,7 @@
  }
 --- a/include/linux/moduleloader.h
 +++ b/include/linux/moduleloader.h
-@@ -80,4 +80,6 @@ int module_finalize(const Elf_Ehdr *hdr,
+@@ -82,4 +82,6 @@ int module_finalize(const Elf_Ehdr *hdr,
  /* Any cleanup needed when module leaves. */
  void module_arch_cleanup(struct module *mod);
  
@@ -145,7 +145,7 @@
  #endif
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -1855,6 +1855,10 @@ void __weak module_arch_cleanup(struct m
+@@ -1833,6 +1833,10 @@ void __weak module_arch_cleanup(struct m
  {
  }
  
@@ -156,7 +156,7 @@
  /* Free a module, remove from lists, etc. */
  static void free_module(struct module *mod)
  {
-@@ -1880,6 +1884,7 @@ static void free_module(struct module *m
+@@ -1865,6 +1869,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 @@
        module_free(mod, mod->module_init);
        kfree(mod->args);
        percpu_modfree(mod);
-@@ -2983,6 +2988,7 @@ out:
+@@ -2954,6 +2959,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 @@
        module_free(mod, mod->module_init);
        module_free(mod, mod->module_core);
  }
-@@ -3122,6 +3128,7 @@ static int do_init_module(struct module
+@@ -3077,6 +3083,7 @@ static int do_init_module(struct module
        mod->strtab = mod->core_strtab;
  #endif
        unset_module_init_ro_nx(mod);

Modified: 
branches/chaos_calmer/target/linux/generic/patches-3.18/204-module_strip.patch
===================================================================
--- 
branches/chaos_calmer/target/linux/generic/patches-3.18/204-module_strip.patch  
    2015-10-07 22:20:55 UTC (rev 47162)
+++ 
branches/chaos_calmer/target/linux/generic/patches-3.18/204-module_strip.patch  
    2015-10-08 09:17:08 UTC (rev 47163)
@@ -109,7 +109,7 @@
  config INIT_ALL_POSSIBLE
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -2665,6 +2665,7 @@ static struct module *setup_load_info(st
+@@ -2670,6 +2670,7 @@ static struct module *setup_load_info(st
  
  static int check_modinfo(struct module *mod, struct load_info *info, int 
flags)
  {
@@ -117,7 +117,7 @@
        const char *modmagic = get_modinfo(info, "vermagic");
        int err;
  
-@@ -2690,6 +2691,7 @@ static int check_modinfo(struct module *
+@@ -2695,6 +2696,7 @@ static int check_modinfo(struct module *
                pr_warn("%s: module is from the staging directory, the quality "
                        "is unknown, you have been warned.\n", mod->name);
        }
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to