The following commit has been merged into the x86/build branch of tip: Commit-ID: 172c8b85dccf331826deda9ef6d7e75fa4f2b3e2 Gitweb: https://git.kernel.org/tip/172c8b85dccf331826deda9ef6d7e75fa4f2b3e2 Author: Kees Cook <keesc...@chromium.org> AuthorDate: Tue, 29 Oct 2019 14:13:39 -07:00 Committer: Borislav Petkov <b...@suse.de> CommitterDate: Mon, 04 Nov 2019 17:57:56 +01:00
alpha: Move EXCEPTION_TABLE to RO_DATA segment Since the EXCEPTION_TABLE is read-only, collapse it into RO_DATA. Signed-off-by: Kees Cook <keesc...@chromium.org> Signed-off-by: Borislav Petkov <b...@suse.de> Cc: Andy Lutomirski <l...@kernel.org> Cc: Arnd Bergmann <a...@arndb.de> Cc: Dave Hansen <dave.han...@linux.intel.com> Cc: Geert Uytterhoeven <ge...@linux-m68k.org> Cc: Heiko Carstens <heiko.carst...@de.ibm.com> Cc: Ivan Kokshaysky <i...@jurassic.park.msu.ru> Cc: linux-al...@vger.kernel.org Cc: linux-a...@vger.kernel.org Cc: linux-arm-ker...@lists.infradead.org Cc: linux-c6x-...@linux-c6x.org Cc: linux-i...@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-s...@vger.kernel.org Cc: Matt Turner <matts...@gmail.com> Cc: Michael Ellerman <m...@ellerman.id.au> Cc: Michal Simek <mon...@monstr.eu> Cc: Richard Henderson <r...@twiddle.net> Cc: Rick Edgecombe <rick.p.edgeco...@intel.com> Cc: Segher Boessenkool <seg...@kernel.crashing.org> Cc: Will Deacon <w...@kernel.org> Cc: x...@kernel.org Cc: Yoshinori Sato <ys...@users.sourceforge.jp> Link: https://lkml.kernel.org/r/20191029211351.13243-18-keesc...@chromium.org --- arch/alpha/kernel/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index edc45f4..bc6f727 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ #define EMITS_PT_NOTE +#define RO_EXCEPTION_TABLE_ALIGN 16 #include <asm-generic/vmlinux.lds.h> #include <asm/thread_info.h> @@ -35,7 +36,6 @@ SECTIONS _etext = .; /* End of text section */ RO_DATA(4096) - EXCEPTION_TABLE(16) /* Will be freed after init */ __init_begin = ALIGN(PAGE_SIZE);