Re: [PATCH v3 1/1] MIPS: kernel: setup.c: fix compilation error

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Mar 29, 2021 at 03:31:36PM +0300, Mauri Sandberg wrote:
> 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@xxxxxxxxxxxxx>
> Reviewed-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
> Tested-by: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
> Cc: trivial@xxxxxxxxxx
> ---
>  arch/mips/kernel/setup.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

applied to mips-fixes. I dropped the Tested-by as this would imply
for me booting that kernel, which I didn't.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]



[Index of Archives]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux