vmlinux.lds.h: Replace RODATA with RO_DATA
There's no reason to keep the RODATA macro: replace the callers with the expected RO_DATA macro. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Andy Lutomirski <luto@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: linux-alpha@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-c6x-dev@linux-c6x.org Cc: linux-ia64@vger.kernel.org Cc: linux-s390@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Rick Edgecombe <rick.p.edgecombe@intel.com> Cc: Segher Boessenkool <segher@kernel.crashing.org> Cc: Will Deacon <will@kernel.org> Cc: x86-ml <x86@kernel.org> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Link: https://lkml.kernel.org/r/20191029211351.13243-12-keescook@chromium.org
This commit is contained in:
parent
eaf937075c
commit
c82318254d
@ -34,7 +34,7 @@ SECTIONS
|
|||||||
swapper_pg_dir = SWAPPER_PGD;
|
swapper_pg_dir = SWAPPER_PGD;
|
||||||
_etext = .; /* End of text section */
|
_etext = .; /* End of text section */
|
||||||
|
|
||||||
RODATA
|
RO_DATA(4096)
|
||||||
EXCEPTION_TABLE(16)
|
EXCEPTION_TABLE(16)
|
||||||
|
|
||||||
/* Will be freed after init */
|
/* Will be freed after init */
|
||||||
|
@ -104,7 +104,7 @@ SECTIONS {
|
|||||||
code_continues2 : {
|
code_continues2 : {
|
||||||
} :text
|
} :text
|
||||||
|
|
||||||
RODATA
|
RO_DATA(4096)
|
||||||
|
|
||||||
.opd : AT(ADDR(.opd) - LOAD_OFFSET) {
|
.opd : AT(ADDR(.opd) - LOAD_OFFSET) {
|
||||||
__start_opd = .;
|
__start_opd = .;
|
||||||
|
@ -51,7 +51,7 @@ SECTIONS {
|
|||||||
}
|
}
|
||||||
|
|
||||||
. = ALIGN(16);
|
. = ALIGN(16);
|
||||||
RODATA
|
RO_DATA(4096)
|
||||||
EXCEPTION_TABLE(16)
|
EXCEPTION_TABLE(16)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -82,7 +82,7 @@ SECTIONS
|
|||||||
}
|
}
|
||||||
|
|
||||||
_sdata = .; /* Start of data section */
|
_sdata = .; /* Start of data section */
|
||||||
RODATA
|
RO_DATA(4096)
|
||||||
|
|
||||||
/* writeable */
|
/* writeable */
|
||||||
.data : { /* Data */
|
.data : { /* Data */
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
_sdata = .;
|
_sdata = .;
|
||||||
PROVIDE (sdata = .);
|
PROVIDE (sdata = .);
|
||||||
|
|
||||||
RODATA
|
RO_DATA(4096)
|
||||||
|
|
||||||
.unprotected : { *(.unprotected) }
|
.unprotected : { *(.unprotected) }
|
||||||
. = ALIGN(4096);
|
. = ALIGN(4096);
|
||||||
|
@ -124,7 +124,7 @@ SECTIONS
|
|||||||
|
|
||||||
. = ALIGN(16);
|
. = ALIGN(16);
|
||||||
|
|
||||||
RODATA
|
RO_DATA(4096)
|
||||||
|
|
||||||
/* Relocation table */
|
/* Relocation table */
|
||||||
|
|
||||||
|
@ -518,9 +518,7 @@
|
|||||||
. = ALIGN((align)); \
|
. = ALIGN((align)); \
|
||||||
__end_rodata = .;
|
__end_rodata = .;
|
||||||
|
|
||||||
/* RODATA & RO_DATA provided for backward compatibility.
|
/* All archs are supposed to use RO_DATA() */
|
||||||
* All archs are supposed to use RO_DATA() */
|
|
||||||
#define RODATA RO_DATA_SECTION(4096)
|
|
||||||
#define RO_DATA(align) RO_DATA_SECTION(align)
|
#define RO_DATA(align) RO_DATA_SECTION(align)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user