diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-04-22 09:39:48 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-04-22 20:19:01 +0300 |
| commit | fd49e8ee70b306a003323a17bbcc0633f322c135 (patch) | |
| tree | be0e5f131ee5afdbaa7a6b5fc76bb36baad8c067 /arch/mips | |
| parent | 238eca821cee90e91139da84ef4f38c74d7cf0d9 (diff) | |
| parent | 7aef27f0b2a8a58c28578d3e0caf3f27e1a1c39c (diff) | |
| download | linux-fd49e8ee70b306a003323a17bbcc0633f322c135.tar.xz | |
Merge branch 'kvm-sev-cgroup' into HEAD
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/setup.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/vmlinux.lds.S | 2 |
2 files changed, 2 insertions, 2 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; 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 */ |