- Update to 2.6.25-rc3.

[linux-flexiantxendom0-3.2.10.git] / include / linux / elfnote.h

diff --git a/include/linux/elfnote.h b/include/linux/elfnote.h
index c25efb5..278e3ef 100644 (file)
--- a/include/linux/elfnote.h
+++ b/include/linux/elfnote.h
@@ -52,7 +52,7 @@
 4484:.balign 4                         ;       \
 .popsection                            ;
 
-#define ELFNOTE(name, type, desc...)           \
+#define ELFNOTE(name, type, desc)              \
        ELFNOTE_START(name, type, "")           \
                desc                    ;       \
        ELFNOTE_END
@@ -76,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)) = {                             \