Commit 2bb25b3a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips-fixes_5.12_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fix from Thomas Bogendoerfer:

 - Fix compile error with option MIPS_ELF_APPENDED_DTB

* tag 'mips-fixes_5.12_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: kernel: setup.c: fix compilation error
parents a080642d 9ae31e2a

arch/mips/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <asm/prom.h>



#ifdef CONFIG_MIPS_ELF_APPENDED_DTB

const char __section(".appended_dtb") __appended_dtb[0x100000];

char __section(".appended_dtb") __appended_dtb[0x100000];

#endif /* CONFIG_MIPS_ELF_APPENDED_DTB */



struct cpuinfo_mips cpu_data[NR_CPUS] __read_mostly;