arm: imx6: defconfig: update tx6 defconfigs

[karo-tx-linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 63d3e8f2970c1377ec822bcb9db8ee306faecee6..dad19cf42dbaa0f088516355e3a359d99821d249 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -136,6 +136,13 @@ static char *static_command_line;
 static char *execute_command;
 static char *ramdisk_execute_command;
 
+/*
+ * Used to generate warnings if static_key manipulation functions are used
+ * before jump_label_init is called.
+ */
+bool static_key_initialized __read_mostly = false;
+EXPORT_SYMBOL_GPL(static_key_initialized);
+
 /*
  * If set, this is an indication to the drivers that reset the underlying
  * device before going ahead with the initialization otherwise driver might
@@ -693,7 +700,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
 
        if (preempt_count() != count) {
                sprintf(msgbuf, "preemption imbalance ");
-               preempt_count() = count;
+               preempt_count_set(count);
        }
        if (irqs_disabled()) {
                strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));