]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
MIPS: kernel: setup.c: fix compilation error
authorMauri Sandberg <sandberg@mailfence.com>
Mon, 29 Mar 2021 12:31:36 +0000 (15:31 +0300)
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>
Tue, 30 Mar 2021 12:51:23 +0000 (14:51 +0200)
commit9ae31e2ab293bf4d9c42e7079b156072f8a7f8ca
treecf2d58100f329a545d4d9411b659048e627b5a13
parent3f6c515d723480bc8afd456b0a52438fe79128a8
MIPS: kernel: setup.c: fix compilation error

With ath79_defconfig enabling CONFIG_MIPS_ELF_APPENDED_DTB gives a
compilation error. This patch fixes it.

Build log:
...
  CC      kernel/locking/percpu-rwsem.o
../arch/mips/kernel/setup.c:46:39: error: conflicting types for
'__appended_dtb'
 const char __section(".appended_dtb") __appended_dtb[0x100000];
                                       ^~~~~~~~~~~~~~
In file included from ../arch/mips/kernel/setup.c:34:
../arch/mips/include/asm/bootinfo.h:118:13: note: previous declaration
of '__appended_dtb' was here
 extern char __appended_dtb[];
             ^~~~~~~~~~~~~~
  CC      fs/attr.o
make[4]: *** [../scripts/Makefile.build:271: arch/mips/kernel/setup.o]
 Error 1
...

Root cause seems to be:
Fixes: b83ba0b9df56 ("MIPS: of: Introduce helper function to get DTB")
Signed-off-by: Mauri Sandberg <sandberg@mailfence.com>
Reviewed-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: trivial@kernel.org
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
arch/mips/kernel/setup.c