Merge "msm: qti_sdio_client: Return error number in diag callback"

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 84d4bce..33cd39a 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -534,6 +534,8 @@ asmlinkage __visible void __init start_kernel(void)
        page_alloc_init();
 
        pr_notice("Kernel command line: %s\n", boot_command_line);
+       /* parameters may set static keys */
+       jump_label_init();
        parse_early_param();
        after_dashes = parse_args("Booting kernel",
                                  static_command_line, __start___param,
@@ -543,8 +545,6 @@ asmlinkage __visible void __init start_kernel(void)
                parse_args("Setting init args", after_dashes, NULL, 0, -1, -1,
                           NULL, set_init_arg);
 
-       jump_label_init();
-
        /*
         * These use large bootmem allocations and must precede
         * kmem_cache_init()