This commit was manufactured by cvs2svn to create tag 'after-xenU'.

[linux-2.6.git] / arch / xen / i386 / kernel / vsyscall-note.S

diff --git a/arch/xen/i386/kernel/vsyscall-note.S b/arch/xen/i386/kernel/vsyscall-note.S
index f404784..d4b5be4 100644 (file)
--- a/arch/xen/i386/kernel/vsyscall-note.S
+++ b/arch/xen/i386/kernel/vsyscall-note.S
@@ -1,32 +1,25 @@
 /*
  * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text.
  * Here we can supply some information useful to userland.
- * First we get the vanilla i386 note that supplies the kernel version info.
  */
 
-#include "../../../i386/kernel/vsyscall-note.S"
+#include <linux/uts.h>
+#include <linux/version.h>
 
-/*
- * Now we add a special note telling glibc's dynamic linker a fake hardware
- * flavor that it will use to choose the search path for libraries in the
- * same way it uses real hardware capabilities like "mmx".
- * We supply "nosegneg" as the fake capability, to indicate that we
- * do not like negative offsets in instructions using segment overrides,
- * since we implement those inefficiently.  This makes it possible to
- * install libraries optimized to avoid those access patterns in someplace
- * like /lib/i686/tls/nosegneg.  Note that an /etc/ld.so.conf.d/file
- * corresponding to the bits here is needed to make ldconfig work right.
- * It should contain:
- *     hwcap 0 nosegneg
- * to match the mapping of bit to name that we give here.
- */
-#define NOTE_KERNELCAP_BEGIN(ncaps, mask) \
-       ASM_ELF_NOTE_BEGIN(".note.kernelcap", "a", "GNU", 2) \
-       .long ncaps, mask
-#define NOTE_KERNELCAP(bit, name) \
-       .byte bit; .asciz name
-#define NOTE_KERNELCAP_END ASM_ELF_NOTE_END
+#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
 
-NOTE_KERNELCAP_BEGIN(1, 1)
-NOTE_KERNELCAP(0, "nosegneg")
-NOTE_KERNELCAP_END
+       ASM_ELF_NOTE_BEGIN(".note.kernel-version", "a", UTS_SYSNAME, 0)
+       .long LINUX_VERSION_CODE
+       ASM_ELF_NOTE_END