diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-30 17:57:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-30 17:57:50 +0200 |
| commit | 2bb25b3a748af6f11df42298e80b9863ed23f2b3 (patch) | |
| tree | 7f9dcdee96945742be43bd3ab7139a16dc67c629 /arch | |
| parent | Merge tag 'for-linus-5.12b-rc6-tag' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | MIPS: kernel: setup.c: fix compilation error (diff) | |
| download | linux-2bb25b3a748af6f11df42298e80b9863ed23f2b3.tar.xz linux-2bb25b3a748af6f11df42298e80b9863ed23f2b3.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 279be0153f8b..23a140327a0b 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -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; |