Merge commit 'v3.0' into x86/vdso

[pandora-kernel.git] / include / linux / elfnote.h

diff --git a/include/linux/elfnote.h b/include/linux/elfnote.h
index 67396db..278e3ef 100644 (file)
--- 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                        ;       \
-  .align 4                             ;       \
+#define ELFNOTE_START(name, type, flags)       \
+.pushsection .note.name, flags,@note   ;       \
+  .balign 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                             ;       \
+1:.asciz #name                         ;       \
+2:.balign 4                            ;       \
+3:
+
+#define ELFNOTE_END                            \
+4484:.balign 4                         ;       \
 .popsection                            ;
+
+#define ELFNOTE(name, type, desc)              \
+       ELFNOTE_START(name, type, "")           \
+               desc                    ;       \
+       ELFNOTE_END
+
 #else  /* !__ASSEMBLER__ */
 #include <linux/elf.h>
 /*
@@ -68,7 +76,7 @@
                typeof(desc) _desc                                      \
                             __attribute__((aligned(sizeof(Elf##size##_Word)))); \
        } _ELFNOTE_PASTE(_note_, unique)                                \
-               __attribute_used__                                      \
+               __used                                                  \
                __attribute__((section(".note." name),                  \
                               aligned(sizeof(Elf##size##_Word)),       \
                               unused)) = {                             \