Revision - 9ae31e2 - MIPS: kernel: setup.c: fix compilation error - origin: https://github.com/torvalds/linux

visit type:

https://github.com/torvalds/linux

17 May 2024, 11:00:25 UTC

Revision 9ae31e2ab293bf4d9c42e7079b156072f8a7f8ca authored by Mauri Sandberg on 29 March 2021, 12:31:36 UTC, committed by Thomas Bogendoerfer on 30 March 2021, 12:51:23 UTC

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>

1 parent 3f6c515

Files
Changes

Permalinks

Tip revision: 9ae31e2ab293bf4d9c42e7079b156072f8a7f8ca authored by Mauri Sandberg on 29 March 2021, 12:31:36 UTC
MIPS: kernel: setup.c: fix compilation error

Tip revision: 9ae31e2

File	Mode	Size
Documentation
LICENSES
arch
block
certs
crypto
drivers
fs
include
init
ipc
kernel
lib
mm
net
samples
scripts
security
sound
tools
usr
virt
.clang-format	-rw-r--r--	16.4 KB
.cocciconfig	-rw-r--r--	59 bytes
.get_maintainer.ignore	-rw-r--r--	71 bytes
.gitattributes	-rw-r--r--	62 bytes
.gitignore	-rw-r--r--	1.9 KB
.mailmap	-rw-r--r--	18.5 KB
COPYING	-rw-r--r--	496 bytes
CREDITS	-rw-r--r--	98.3 KB
Kbuild	-rw-r--r--	1.3 KB
Kconfig	-rw-r--r--	555 bytes
MAINTAINERS	-rw-r--r--	577.0 KB
Makefile	-rw-r--r--	64.6 KB
README	-rw-r--r--	727 bytes

Showing with 0 additions and 0 deletions (0 / 0 diffs computed)

Computing file changes ...

https://github.com/torvalds/linux

MIPS: kernel: setup.c: fix compilation error

README