Merge tag 'platform-drivers-x86-v6.10-1' of git://git.kernel.org/pub/scm/linux/kernel...

[thirdparty/kernel/stable.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 881f6230ee59e9675eb98b62adf761ee74823a16..f4e6001ebe79fcdff84769f926a478d0c40908c7 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -636,6 +636,8 @@ static void __init setup_command_line(char *command_line)
        if (!saved_command_line)
                panic("%s: Failed to allocate %zu bytes\n", __func__, len + ilen);
 
+       len = xlen + strlen(command_line) + 1;
+
        static_command_line = memblock_alloc(len, SMP_CACHE_BYTES);
        if (!static_command_line)
                panic("%s: Failed to allocate %zu bytes\n", __func__, len);
@@ -1413,6 +1415,7 @@ static void mark_readonly(void)
                 * insecure pages which are W+X.
                 */
                flush_module_init_free_work();
+               jump_label_init_ro();
                mark_rodata_ro();
                debug_checkwx();
                rodata_test();