Merge branch 'sched/urgent' into sched/core, to avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 7 insertions, 5 deletions

diff --git a/kernel/module.c b/kernel/module.c
index 8dc7f5e80dd8..11869408f79b 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;
 }
@@ -1013,6 +1013,8 @@ 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_CPU_OUT_OF_SPEC, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't
@@ -3218,7 +3220,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
 
@@ -3813,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