]> git.baikalelectronics.ru Git - kernel.git/commit
MIPS: Always define builtin_cmdline
authorPaul Burton <paul.burton@mips.com>
Sat, 12 Oct 2019 20:43:36 +0000 (20:43 +0000)
committerPaul Burton <paul.burton@mips.com>
Sat, 12 Oct 2019 20:44:22 +0000 (13:44 -0700)
commit4ff135782cc6b258f08bc1a1f43d16e94e945ea2
tree1c557ab31140fef7381b64d7b47a172c386fe47e
parent4a0d4c00f98bf841c101cfd621fa4eee4d98d78c
MIPS: Always define builtin_cmdline

Commit 97c544adafca ("MIPS: cmdline: Clean up boot_command_line
initialization") made use of builtin_cmdline conditional upon plain C if
statements rather than preprocessor #ifdef's. This caused build failures
for configurations with CONFIG_CMDLINE_BOOL=n where builtin_cmdline
wasn't defined, for example:

   arch/mips/kernel/setup.c: In function 'bootcmdline_init':
>> arch/mips/kernel/setup.c:582:30: error: 'builtin_cmdline' undeclared
    (first use in this function); did you mean 'builtin_driver'?
      strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
                                 ^~~~~~~~~~~~~~~
                                 builtin_driver
   arch/mips/kernel/setup.c:582:30: note: each undeclared identifier is
    reported only once for each function it appears in

Fix this by defining builtin_cmdline as an empty string in the affected
configurations. All of the paths that use it should be optimized out
anyway so the data itself gets optimized away too.

Signed-off-by: Paul Burton <paul.burton@mips.com>
Fixes: 97c544adafca ("MIPS: cmdline: Clean up boot_command_line initialization")
Reported-by: kbuild test robot <lkp@intel.com>
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Cc: linux-mips@vger.kernel.org
arch/mips/kernel/setup.c