Use existing elfnote.h to generate vsyscall notes, rather than doing
it locally. Changes elfnote.h a bit to suite, since this is the first
asm user, and it wasn't quite right.
Signed-off-by: Jeremy Fitzhardinge <[email protected]>
Cc: "Eric W. Biederman" <[email protected]>
Cc: Roland McGrath <[email protected]>
Cc: Andrew Morton <[email protected]>
---
arch/i386/kernel/vsyscall-note.S | 23 ++++++-----------------
arch/x86_64/vdso/vdso-note.S | 4 ++--
include/linux/elfnote.h | 18 +++++++++++++-----
3 files changed, 21 insertions(+), 24 deletions(-)
===================================================================
--- a/arch/i386/kernel/vsyscall-note.S
+++ b/arch/i386/kernel/vsyscall-note.S
@@ -3,23 +3,12 @@
* Here we can supply some information useful to userland.
*/
-#include <linux/uts.h>
#include <linux/version.h>
+#include <linux/elfnote.h>
-#define ASM_ELF_NOTE_BEGIN(name, flags, vendor, type) \
- .section name, flags; \
- .balign 4; \
- .long 1f - 0f; /* name length */ \
- .long 3f - 2f; /* data length */ \
- .long type; /* note type */ \
-0: .asciz vendor; /* vendor name */ \
-1: .balign 4; \
-2:
-
-#define ASM_ELF_NOTE_END \
-3: .balign 4; /* pad out section */ \
- .previous
-
- ASM_ELF_NOTE_BEGIN(".note.kernel-version", "a", UTS_SYSNAME, 0)
+/* 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
- ASM_ELF_NOTE_END
+ELFNOTE_END
===================================================================
--- a/arch/x86_64/vdso/vdso-note.S
+++ b/arch/x86_64/vdso/vdso-note.S
@@ -8,5 +8,5 @@
#include <linux/elfnote.h>
/* Supply version information to coredumps */
- ELFNOTE(kernelversion, 0, .long, LINUX_VERSION_CODE)
- ELFNOTE(os, 0, .asciz, UTS_SYSNAME)
+ ELFNOTE(kernelversion, 0, .long LINUX_VERSION_CODE)
+ ELFNOTE(os, 0, .asciz UTS_SYSNAME)
===================================================================
--- a/include/linux/elfnote.h
+++ b/include/linux/elfnote.h
@@ -38,17 +38,25 @@
* e.g. ELFNOTE(XYZCo, 42, .asciz, "forty-two")
* ELFNOTE(XYZCo, 12, .long, 0xdeadbeef)
*/
-#define ELFNOTE(name, type, desctype, descdata) \
-.pushsection .note.name, "",@note ; \
+#define ELFNOTE_START(name, type, flags) \
+.pushsection .note.name, flags,@note ; \
.align 4 ; \
.long 2f - 1f /* namesz */ ; \
- .long 4f - 3f /* descsz */ ; \
+ .long 4484f - 3f /* descsz */ ; \
.long type ; \
1:.asciz #name ; \
2:.align 4 ; \
-3:desctype descdata ; \
-4:.align 4 ; \
+3:
+
+#define ELFNOTE_END \
+4484:.align 4 ; \
.popsection ;
+
+#define ELFNOTE(name, type, desc) \
+ ELFNOTE_START(name, type, "") \
+ desc ; \
+ ELFNOTE_END
+
#else /* !__ASSEMBLER__ */
#include <linux/elf.h>
/*
--
I used .balign because .align has inconsistent meaning on some platforms
(matches .p2align instead of .balign). Using .align in a
machine-independent file seems questionable.
Thanks,
Roland
Roland McGrath wrote:
> I used .balign because .align has inconsistent meaning on some platforms
> (matches .p2align instead of .balign). Using .align in a
> machine-independent file seems questionable.
>
OK, good point.
J
Roland McGrath wrote:
> I used .balign because .align has inconsistent meaning on some platforms
> (matches .p2align instead of .balign). Using .align in a
> machine-independent file seems questionable.
>
>
>
Subject: use balign in elfnote.h
Roland McGrath <[email protected]>:
> I used .balign because .align has inconsistent meaning on some platforms
> (matches .p2align instead of .balign). Using .align in a
> machine-independent file seems questionable.
Signed-off-by: Jeremy Fitzhardinge <[email protected]>
Cc: Roland McGrath <[email protected]>
---
include/linux/elfnote.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
===================================================================
--- a/include/linux/elfnote.h
+++ b/include/linux/elfnote.h
@@ -40,16 +40,16 @@
*/
#define ELFNOTE_START(name, type, flags) \
.pushsection .note.name, flags,@note ; \
- .align 4 ; \
+ .balign 4 ; \
.long 2f - 1f /* namesz */ ; \
.long 4484f - 3f /* descsz */ ; \
.long type ; \
1:.asciz #name ; \
-2:.align 4 ; \
+2:.balign 4 ; \
3:
#define ELFNOTE_END \
-4484:.align 4 ; \
+4484:.balign 4 ; \
.popsection ;
#define ELFNOTE(name, type, desc) \