diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-17 20:34:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-17 20:34:50 +0100 |
| commit | e69beeabac6dae8d4318f46c7aa0c70b9599afb1 (patch) | |
| tree | 7156ad3c99f71fe95243eeeca50b52f65e17c050 | |
| parent | Merge tag 'thermal-v5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | MIPS: vmlinux.lds.S: Fix appended dtb not properly aligned (diff) | |
| download | linux-e69beeabac6dae8d4318f46c7aa0c70b9599afb1.tar.xz linux-e69beeabac6dae8d4318f46c7aa0c70b9599afb1.zip | |
Merge tag 'mips-fixes_5.12_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fix from Thomas Bogendoerfer:
"Fix for fdt alignment when image is compressed"
* tag 'mips-fixes_5.12_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
MIPS: vmlinux.lds.S: Fix appended dtb not properly aligned
| -rw-r--r-- | arch/mips/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index 1234834cc4c4..1f98947fe715 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S @@ -176,7 +176,7 @@ SECTIONS .fill : { FILL(0); BYTE(0); - . = ALIGN(8); + STRUCT_ALIGN(); } __appended_dtb = .; /* leave space for appended DTB */ |