perf vendor events power9: Add hv_24x7 core level metric events

[linux-2.6-microblaze.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index de2f9fa..ae78fb6 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -388,8 +388,6 @@ static int __init bootconfig_params(char *param, char *val,
 {
        if (strcmp(param, "bootconfig") == 0) {
                bootconfig_found = true;
-       } else if (strcmp(param, "--") == 0) {
-               initargs_found = true;
        }
        return 0;
 }
@@ -400,19 +398,23 @@ static void __init setup_boot_config(const char *cmdline)
        const char *msg;
        int pos;
        u32 size, csum;
-       char *data, *copy;
+       char *data, *copy, *err;
        int ret;
 
        /* Cut out the bootconfig data even if we have no bootconfig option */
        data = get_boot_config_from_initrd(&size, &csum);
 
        strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
-       parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
-                  bootconfig_params);
+       err = parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
+                        bootconfig_params);
 
-       if (!bootconfig_found)
+       if (IS_ERR(err) || !bootconfig_found)
                return;
 
+       /* parse_args() stops at '--' and returns an address */
+       if (err)
+               initargs_found = true;
+
        if (!data) {
                pr_err("'bootconfig' found on command line, but no bootconfig found\n");
                return;