Messages in this thread | | | Date | Thu, 03 Sep 2009 14:04:36 +0800 | From | Xiao Guangrong <> | Subject | Re: [RFC][PATCH] x86: introduce parse_early_param_alone() to parse param early (Was Re: linux-next: reservetop fix disables mem= ) |
| |
Américo Wang wrote:
>> +#ifdef CONFIG_CMDLINE_BOOL >> +#ifdef CONFIG_CMDLINE_OVERRIDE >> + strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); >> +#else >> + if (builtin_cmdline[0]) { >> + /* append boot loader cmdline to builtin */ >> + strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE); >> + strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE); >> + strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); >> + } >> +#endif >> +#endif > > > This seems ugly. > > CMDLINE_OVERRIDE depends on CMDLINE_BOOL, right? So the outer #ifdef > can be removed. :) >
Thanks for your review, but I think we can't do that.
Yeah, CMDLINE_OVERRIDE depends on CMDLINE_BOOL, but we don't know whether CONFIG_CMDLINE_BOOL is defined if CONFIG_CMDLINE_OVERRIDE is not defined, like below:
#ifdef CONFIG_CMDLINE_OVERRIDE strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); #else /* There have two cases: * 1: if CONFIG_CMDLINE_BOOL is defined, it's OK * 2: if CONFIG_CMDLINE_BOOL is not defined, builtin_cmdline * is not defined, so, the compiler will complain with it */ if (builtin_cmdline[0]) { /* append boot loader cmdline to builtin */ strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE); strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE); strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); } #endif
Thanks, Xiao
> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |