summaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2019-11-11 09:22:00 -0800
committerBorislav Petkov <bp@suse.de>2019-11-12 09:56:51 +0100
commitde7156689d69e9861d9ddc54a9dea623c25020c5 (patch)
treee123edf4da6feca9a3d61d750d592af4412d2cfa /arch/m68k
parent7705dc8557973d8ad8f10840f61d8ec805695e9e (diff)
downloadlinux-rpi-de7156689d69e9861d9ddc54a9dea623c25020c5.tar.gz
linux-rpi-de7156689d69e9861d9ddc54a9dea623c25020c5.tar.bz2
linux-rpi-de7156689d69e9861d9ddc54a9dea623c25020c5.zip
m68k: Convert missed RODATA to RO_DATA
I missed two instances of the old RODATA macro (seems I was searching for vmlinux.lds* not vmlinux*lds*). Fix both instances and double-check the entire tree for other "RODATA" instances in linker scripts. Fixes: c82318254d15 ("vmlinux.lds.h: Replace RODATA with RO_DATA") Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Borislav Petkov <bp@suse.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: linux-m68k@lists.linux-m68k.org Cc: Sam Creasey <sammy@sammy.net> Link: https://lkml.kernel.org/r/201911110920.5840E9AF1@keescook
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/kernel/vmlinux-std.lds2
-rw-r--r--arch/m68k/kernel/vmlinux-sun3.lds2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds
index 6e7eb49ed985..4d33da4e7106 100644
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
@@ -31,7 +31,7 @@ SECTIONS
_sdata = .; /* Start of data section */
- RODATA
+ RO_DATA(4096)
RW_DATA(16, PAGE_SIZE, THREAD_SIZE)
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index 1a0ad6b6dd8c..87d9f4d08f65 100644
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -24,7 +24,7 @@ SECTIONS
*(.fixup)
*(.gnu.warning)
} :text = 0x4e75
- RODATA
+ RO_DATA(4096)
_etext = .; /* End of text section */