[PATCH 6/9] always allocate space for notes
flat view
STALE7049d
From: Jeremy Fitzhardinge <hidden>
Date: 2007-06-21 00:32:20
Also in:
lkml
This patch makes .note segments always allocated; that is, they are loaded as part of the binary and appear in the :data segment. This is not always necessary, but certain users - such as vsyscalls and notes in boot images - require the notes to be allocated. Rather than having two ways of creating notes, just have one which suits everyone. The only downside is that the notes will actually consume space at runtime. This isn't a big deal, since a typical kernel doesn't have very many, if any. Also, make the ELFNOTE() macro do the right thing in 32/64 bit environments. Signed-off-by: Jeremy Fitzhardinge <redacted> --- arch/i386/kernel/vmlinux.lds.S | 9 ++++----- arch/i386/kernel/vsyscall-note.S | 4 +--- include/asm-generic/vmlinux.lds.h | 7 ++++++- include/linux/elfnote.h | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) ===================================================================
--- a/arch/i386/kernel/vmlinux.lds.S
+++ b/arch/i386/kernel/vmlinux.lds.S@@ -28,10 +28,9 @@ jiffies = jiffies_64; jiffies = jiffies_64; PHDRS { - text PT_LOAD FLAGS(5); /* R_E */ - data PT_LOAD FLAGS(7); /* RWE */ - note PT_NOTE FLAGS(0); /* ___ */ + STD_PHDRS } + SECTIONS { . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
@@ -72,6 +71,8 @@ SECTIONS _sdata = .; /* End of text section */ RODATA + + NOTES /* writeable */ . = ALIGN(4096);
@@ -211,6 +212,4 @@ SECTIONS STABS_DEBUG DWARF_DEBUG - - NOTES }
===================================================================
--- a/arch/i386/kernel/vsyscall-note.S
+++ b/arch/i386/kernel/vsyscall-note.S@@ -9,9 +9,7 @@ /* Ideally this would use UTS_NAME, but using a quoted string here doesn't work. Remember to change this when changing the kernel's name. */ -ELFNOTE_START(Linux, 0, "a") - .long LINUX_VERSION_CODE -ELFNOTE_END +ELFNOTE(Linux, 0, .long LINUX_VERSION_CODE) #ifdef CONFIG_XEN
===================================================================
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h@@ -245,8 +245,13 @@ __stop___bug_table = .; \ } +#define STD_PHDRS \ + text PT_LOAD FILEHDR PHDRS FLAGS(5); /* R_E */ \ + data PT_LOAD FLAGS(7); /* RWE */ \ + note PT_NOTE FLAGS(0); /* ___ */ + #define NOTES \ - .notes : { *(.note.*) } :note + .notes : { *(.note.*) } :data :note #define INITCALLS \ *(.initcall0.init) \
===================================================================
--- a/include/linux/elfnote.h
+++ b/include/linux/elfnote.h@@ -53,7 +53,7 @@ 4484:.balign 4 ; \ .popsection ; #define ELFNOTE(name, type, desc) \ - ELFNOTE_START(name, type, "") \ + ELFNOTE_START(name, type, "a") \ desc ; \ ELFNOTE_END
--