From: Jeremy Fitzhardinge Three cleanups: 1: ELF notes are never mapped, so there's no need to have any access flags in their phdr. 2: When generating them from asm, tell the assembler to use a SHT_NOTE section type. There doesn't seem to be a way to do this from C. 3: Use ANSI rather than traditional cpp behaviour to stringify the macro argument. Signed-off-by: Jeremy Fitzhardinge Cc: Eric W. Biederman Signed-off-by: Andrew Morton --- arch/i386/kernel/vmlinux.lds.S | 2 +- include/asm-generic/vmlinux.lds.h | 2 +- include/linux/elfnote.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/i386/kernel/vmlinux.lds.S~clean-up-elf-note-generation arch/i386/kernel/vmlinux.lds.S --- a/arch/i386/kernel/vmlinux.lds.S~clean-up-elf-note-generation +++ a/arch/i386/kernel/vmlinux.lds.S @@ -31,7 +31,7 @@ _proxy_pda = 0; PHDRS { text PT_LOAD FLAGS(5); /* R_E */ data PT_LOAD FLAGS(7); /* RWE */ - note PT_NOTE FLAGS(4); /* R__ */ + note PT_NOTE FLAGS(0); /* ___ */ } SECTIONS { diff -puN include/asm-generic/vmlinux.lds.h~clean-up-elf-note-generation include/asm-generic/vmlinux.lds.h --- a/include/asm-generic/vmlinux.lds.h~clean-up-elf-note-generation +++ a/include/asm-generic/vmlinux.lds.h @@ -230,7 +230,7 @@ } #define NOTES \ - .notes : { *(.note.*) } :note + .notes : { *(.note.*) } :note #define INITCALLS \ *(.initcall0.init) \ diff -puN include/linux/elfnote.h~clean-up-elf-note-generation include/linux/elfnote.h --- a/include/linux/elfnote.h~clean-up-elf-note-generation +++ a/include/linux/elfnote.h @@ -39,12 +39,12 @@ * ELFNOTE(XYZCo, 12, .long, 0xdeadbeef) */ #define ELFNOTE(name, type, desctype, descdata) \ -.pushsection .note.name ; \ +.pushsection .note.name, "",@note ; \ .align 4 ; \ .long 2f - 1f /* namesz */ ; \ .long 4f - 3f /* descsz */ ; \ .long type ; \ -1:.asciz "name" ; \ +1:.asciz #name ; \ 2:.align 4 ; \ 3:desctype descdata ; \ 4:.align 4 ; \ _