- fixed compile error with option MIPS_ELF_APPENDED_DTB

-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEEbt46xwy6kEcDOXoUeZbBVTGwZHAFAmBjIDYaHHRzYm9nZW5k
 QGFscGhhLmZyYW5rZW4uZGUACgkQeZbBVTGwZHCSWA/+IRo6hEG3apdw1bVuR50Q
 5xOhPcMnm4fItk0N3HI5hkl/8mee2oy+6AnLCKKbhSJhtcf99HfWwJlfwlQrQQDu
 fnt0xTR31QvUJHKUZ4YYxrqOHDVN9JKoHCVmLzdrFDR1ixZA/Aa11n9wRj6Vpyqj
 OTS3CZaGnQj7YW575WySMzIxIpKl6gesbDjlL/Q3PG8/C5M0RPSFtlAsuIJWzdgv
 iBQGAJEo3oWfffn9Xbq3pho5U6DTaWjNWNs9oLfU7nVGE+OYIXDVz7pq6JtLr7dU
 EuZqxJV/km3QvNDierLLLA4WXBJuN9MI+HUhzd1J+YcWiAXXbu6NTSxr0VAGVIfs
 f5GaRIU6T6lnWTWhRpX/68gZ8Z58q1sr00xOqPvP2B6hH2NtDts4c+Da1CzB33VW
 vTe/ucn0/VwNNc5aaLLqwtsBdzfNA81TM6vQZbcXwBAC/rRqpv8PbFiAU1d4q2pA
 lFL9MOoT4sJmnxKeCdCa0vN+iyJfxCtdANahksp8BBYhn/g5uMQfM1b9dI/ctF4k
 3PAwjzwK7gwN4rnvHrWxF7Y8KuY9cclZB8U+KHSno9+NWN1FcgPaNlRR+NAd8seg
 EWGQcWj5xfTdD4PxzjyuqnxNCdmDnL+IUNspMIRlywv83+zBVtsqkJujKQVDT4Dl
 GuL/CnhQEnVcYZD+ISZmx8w=
 =fsy2
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-03-30 08:57:50 -07:00
commit 2bb25b3a74

View file

@ -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;