Messages in this thread Patch in this message | | | From | Mark Salyzyn <> | Subject | [PATCH 1/4 v2] init: move string constants to __initconst section | Date | Mon, 10 Feb 2020 06:45:02 -0800 |
| |
A space-saving measure is to move string constants to __initconst.
Signed-off-by: Mark Salyzyn <salyzyn@android.com> Cc: linux-kernel@vger.kernel.org Cc: kernel-team@android.com Cc: "Theodore Ts'o" <tytso@mit.edu> Cc: Kees Cook <keescook@chromium.org> --- init/main.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/init/main.c b/init/main.c index cc0ee4873419c..a58b72c9433e7 100644 --- a/init/main.c +++ b/init/main.c @@ -524,24 +524,27 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { } * parsing is performed in place, and we should allow a component to * store reference of name/value for future reference. */ +static const char alloc_fail_msg[] __initconst = + "%s: Failed to allocate %zu bytes\n"; static void __init setup_command_line(char *command_line) { size_t len, xlen = 0, ilen = 0; + static const char argsep_str[] __initconst = " -- "; if (extra_command_line) xlen = strlen(extra_command_line); if (extra_init_args) - ilen = strlen(extra_init_args) + 4; /* for " -- " */ + ilen = strlen(extra_init_args) + strlen(argsep_str); len = xlen + strlen(boot_command_line) + 1; saved_command_line = memblock_alloc(len + ilen, SMP_CACHE_BYTES); if (!saved_command_line) - panic("%s: Failed to allocate %zu bytes\n", __func__, len + ilen); + panic(alloc_fail_msg, __func__, len + ilen); static_command_line = memblock_alloc(len, SMP_CACHE_BYTES); if (!static_command_line) - panic("%s: Failed to allocate %zu bytes\n", __func__, len); + panic(alloc_fail_msg, __func__, len); if (xlen) { /* @@ -562,9 +565,9 @@ static void __init setup_command_line(char *command_line) * to init. */ len = strlen(saved_command_line); - if (!strstr(boot_command_line, " -- ")) { - strcpy(saved_command_line + len, " -- "); - len += 4; + if (!strstr(boot_command_line, argsep_str)) { + strcpy(saved_command_line + len, argsep_str); + len += strlen(argsep_str); } else saved_command_line[len++] = ' '; @@ -1001,12 +1004,11 @@ static int __init initcall_blacklist(char *str) entry = memblock_alloc(sizeof(*entry), SMP_CACHE_BYTES); if (!entry) - panic("%s: Failed to allocate %zu bytes\n", - __func__, sizeof(*entry)); + panic(alloc_fail_msg, __func__, sizeof(*entry)); entry->buf = memblock_alloc(strlen(str_entry) + 1, SMP_CACHE_BYTES); if (!entry->buf) - panic("%s: Failed to allocate %zu bytes\n", + panic(alloc_fail_msg, __func__, strlen(str_entry) + 1); strcpy(entry->buf, str_entry); list_add(&entry->next, &blacklisted_initcalls); @@ -1204,7 +1206,7 @@ static void __init do_initcalls(void) command_line = kzalloc(len, GFP_KERNEL); if (!command_line) - panic("%s: Failed to allocate %zu bytes\n", __func__, len); + panic(alloc_fail_msg, __func__, len); for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; level++) { /* Parser modifies command_line, restore it each time */ -- 2.25.0.341.g760bfbb309-goog
| |