1 files changed, 15 insertions, 9 deletions

diff --git a/kernel/module.c b/kernel/module.c
index d24fcf29cb64..079c4615607d 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -640,7 +640,7 @@ static int module_unload_init(struct module *mod)
         INIT_LIST_HEAD(&mod->target_list);
 
         /* Hold reference count during initialization. */
-        __this_cpu_write(mod->refptr->incs, 1);
+        raw_cpu_write(mod->refptr->incs, 1);
 
         return 0;
 }
@@ -815,9 +815,6 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
                 return -EFAULT;
         name[MODULE_NAME_LEN-1] = '\0';
 
-        if (!(flags & O_NONBLOCK))
-                pr_warn("waiting module removal not supported: please upgrade\n");
-
         if (mutex_lock_interruptible(&module_mutex) != 0)
                 return -EINTR;
 
@@ -1013,9 +1010,11 @@ static size_t module_flags_taint(struct module *mod, char *buf)
                 buf[l++] = 'F';
         if (mod->taints & (1 << TAINT_CRAP))
                 buf[l++] = 'C';
+        if (mod->taints & (1 << TAINT_UNSIGNED_MODULE))
+                buf[l++] = 'E';
         /*
          * TAINT_FORCED_RMMOD: could be added.
-         * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
+         * TAINT_CPU_OUT_OF_SPEC, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
          * apply to modules.
          */
         return l;
@@ -1948,6 +1947,10 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
 
                 switch (sym[i].st_shndx) {
                 case SHN_COMMON:
+                        /* Ignore common symbols */
+                        if (!strncmp(name, "__gnu_lto", 9))
+                                break;
+
                         /* We compiled with -fno-common.  These are not
                            supposed to happen.  */
                         pr_debug("Common symbol: %s\n", name);
@@ -3214,7 +3217,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
                 pr_notice_once("%s: module verification failed: signature "
                                "and/or  required key missing - tainting "
                                "kernel\n", mod->name);
-                add_taint_module(mod, TAINT_FORCED_MODULE, LOCKDEP_STILL_OK);
+                add_taint_module(mod, TAINT_UNSIGNED_MODULE, LOCKDEP_STILL_OK);
         }
 #endif
 
@@ -3265,6 +3268,9 @@ static int load_module(struct load_info *info, const char __user *uargs,
 
         dynamic_debug_setup(info->debug, info->num_debug);
 
+        /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
+        ftrace_module_init(mod);
+
         /* Finally it's fully formed, ready to start executing. */
         err = complete_formation(mod, info);
         if (err)
@@ -3809,12 +3815,12 @@ void print_modules(void)
         list_for_each_entry_rcu(mod, &modules, list) {
                 if (mod->state == MODULE_STATE_UNFORMED)
                         continue;
-                printk(" %s%s", mod->name, module_flags(mod, buf));
+                pr_cont(" %s%s", mod->name, module_flags(mod, buf));
         }
         preempt_enable();
         if (last_unloaded_module[0])
-                printk(" [last unloaded: %s]", last_unloaded_module);
-        printk("\n");
+                pr_cont(" [last unloaded: %s]", last_unloaded_module);
+        pr_cont("\n");
 }
 
 #ifdef CONFIG_MODVERSIONS