Instead of depending on markings in the section following NOTES to
restore the associated Program Header, use a dummy section, as done
in other architectures. This is preparation for moving NOTES into the
RO_DATA macro.

Signed-off-by: Kees Cook <keesc...@chromium.org>
---
 arch/x86/kernel/vmlinux.lds.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index e2feacf921a0..788e78978030 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -147,8 +147,9 @@ SECTIONS
        } :text = 0x9090
 
        NOTES :text :note
+       .dummy : { *(.dummy) } :text
 
-       EXCEPTION_TABLE(16) :text = 0x9090
+       EXCEPTION_TABLE(16)
 
        /* .text should occupy whole number of pages */
        . = ALIGN(PAGE_SIZE);
-- 
2.17.1

Reply via email to