Merge tag 'modules-for-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...
[sfrench/cifs-2.6.git] / kernel / module.c
index d072877075576ba60cbc8268b70db11f58fe0a83..40f983cbea81d1e3711955dfb2409659d89fd317 100644 (file)
@@ -49,9 +49,7 @@
 #include <linux/rculist.h>
 #include <linux/uaccess.h>
 #include <asm/cacheflush.h>
-#ifdef CONFIG_STRICT_MODULE_RWX
-#include <asm/set_memory.h>
-#endif
+#include <linux/set_memory.h>
 #include <asm/mmu_context.h>
 #include <linux/license.h>
 #include <asm/sections.h>
@@ -1203,10 +1201,7 @@ static ssize_t store_uevent(struct module_attribute *mattr,
                            struct module_kobject *mk,
                            const char *buffer, size_t count)
 {
-       enum kobject_action action;
-
-       if (kobject_action_type(buffer, count, &action) == 0)
-               kobject_uevent(&mk->kobj, action);
+       kobject_synth_uevent(&mk->kobj, buffer, count);
        return count;
 }
 
@@ -3100,9 +3095,9 @@ static int find_module_sections(struct module *mod, struct load_info *info)
        mod->trace_events = section_objs(info, "_ftrace_events",
                                         sizeof(*mod->trace_events),
                                         &mod->num_trace_events);
-       mod->trace_enums = section_objs(info, "_ftrace_enum_map",
-                                       sizeof(*mod->trace_enums),
-                                       &mod->num_trace_enums);
+       mod->trace_evals = section_objs(info, "_ftrace_eval_map",
+                                       sizeof(*mod->trace_evals),
+                                       &mod->num_trace_evals);
 #endif
 #ifdef CONFIG_TRACING
        mod->trace_bprintk_fmt_start = section_objs(info, "__trace_printk_fmt",
@@ -4224,7 +4219,7 @@ const struct exception_table_entry *search_module_extables(unsigned long addr)
                goto out;
 
        e = search_extable(mod->extable,
-                          mod->extable + mod->num_exentries - 1,
+                          mod->num_exentries,
                           addr);
 out:
        preempt_enable();