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 <[email protected]>
Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Acked-by: Geert Uytterhoeven <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: [email protected]
Cc: Sam Creasey <[email protected]>
Link: https://lkml.kernel.org/r/201911110920.5840E9AF1@keescook

diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds
index 6e7eb49ed985e10b4551e674ffd28e5d82aa13b3..4d33da4e7106042e390ecb52df1308ec58dfcb56 100644 (file)
--- 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 1a0ad6b6dd8c3726087785d964c35d5c0af30bfa..87d9f4d08f6553cf7343f10c3d34e3d141ef465a 100644 (file)
--- 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 */