target/linux/ramips/patches-5.4/0002-MIPS-Always-define-builtin_cmdline.patch

   1 From b7340422cc16c5deff100812f38114bb5ec81203 Mon Sep 17 00:00:00 2001
   2 From: Paul Burton <paul.burton@mips.com>
   3 Date: Sat, 12 Oct 2019 20:43:36 +0000
   4 Subject: [PATCH] MIPS: Always define builtin_cmdline
   5
   6 Commit 7784cac69735 ("MIPS: cmdline: Clean up boot_command_line
   7 initialization") made use of builtin_cmdline conditional upon plain C if
   8 statements rather than preprocessor #ifdef's. This caused build failures
   9 for configurations with CONFIG_CMDLINE_BOOL=n where builtin_cmdline
  10 wasn't defined, for example:
  11
  12    arch/mips/kernel/setup.c: In function 'bootcmdline_init':
  13 >> arch/mips/kernel/setup.c:582:30: error: 'builtin_cmdline' undeclared
  14     (first use in this function); did you mean 'builtin_driver'?
  15       strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
  16                                  ^~~~~~~~~~~~~~~
  17                                  builtin_driver
  18    arch/mips/kernel/setup.c:582:30: note: each undeclared identifier is
  19     reported only once for each function it appears in
  20
  21 Fix this by defining builtin_cmdline as an empty string in the affected
  22 configurations. All of the paths that use it should be optimized out
  23 anyway so the data itself gets optimized away too.
  24
  25 Signed-off-by: Paul Burton <paul.burton@mips.com>
  26 Fixes: 7784cac69735 ("MIPS: cmdline: Clean up boot_command_line initialization")
  27 Reported-by: kbuild test robot <lkp@intel.com>
  28 Reported-by: Nathan Chancellor <natechancellor@gmail.com>
  29 Cc: linux-mips@vger.kernel.org
  30 ---
  31  arch/mips/kernel/setup.c | 2 ++
  32  1 file changed, 2 insertions(+)
  33
  34 --- a/arch/mips/kernel/setup.c
  35 +++ b/arch/mips/kernel/setup.c
  36 @@ -68,6 +68,8 @@ char __initdata arcs_cmdline[COMMAND_LIN
  37
  38  #ifdef CONFIG_CMDLINE_BOOL
  39  static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE;
  40 +#else
  41 +static const char builtin_cmdline[] __initconst = "";
  42  #endif
  43
  44  /*