From c4c0e4a9fed66041b06243516f60829886b474d6 Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@xensource.com>
Date: Mon, 25 Sep 2006 23:32:28 -0700
Subject: [PATCH] --- yaml --- r: 35663 b: refs/heads/master c:
 5091e746848f74c9a2c0579b4ef8d8cd1a6b135d h: refs/heads/master i:   35661:
 7f87bc7a4c43822ab5a27b81b73b02b29ffb87a6   35659:
 112de4d2428304a212f73c14267ff37c8f6828d7   35655:
 94b93e975158b47d701bde19c7a6c43f26d5f1c5   35647:
 2d9c780a47cae218af7edbf68023cf068166d94a v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/elfnote.h | 32 +++++++++++++++++---------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 98182ddb8bb5..4241eb099404 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c9b8b388296ad5a306ab238dc677cfe6ff4cb12
+refs/heads/master: 5091e746848f74c9a2c0579b4ef8d8cd1a6b135d
diff --git a/trunk/include/linux/elfnote.h b/trunk/include/linux/elfnote.h
index 16f9f8ebffd9..67396db141e8 100644
--- a/trunk/include/linux/elfnote.h
+++ b/trunk/include/linux/elfnote.h
@@ -31,22 +31,24 @@
 /*
  * Generate a structure with the same shape as Elf{32,64}_Nhdr (which
  * turn out to be the same size and shape), followed by the name and
- * desc data with appropriate padding.  The 'desc' argument includes
- * the assembler pseudo op defining the type of the data: .asciz
- * "hello, world"
+ * desc data with appropriate padding.  The 'desctype' argument is the
+ * assembler pseudo op defining the type of the data e.g. .asciz while
+ * 'descdata' is the data itself e.g.  "hello, world".
+ *
+ * e.g. ELFNOTE(XYZCo, 42, .asciz, "forty-two")
+ *      ELFNOTE(XYZCo, 12, .long, 0xdeadbeef)
  */
-.macro ELFNOTE name type desc:vararg
-.pushsection ".note.\name"
-  .align 4
-  .long 2f - 1f			/* namesz */
-  .long 4f - 3f			/* descsz */
-  .long \type
-1:.asciz "\name"
-2:.align 4
-3:\desc
-4:.align 4
-.popsection
-.endm
+#define ELFNOTE(name, type, desctype, descdata)	\
+.pushsection .note.name			;	\
+  .align 4				;	\
+  .long 2f - 1f		/* namesz */	;	\
+  .long 4f - 3f		/* descsz */	;	\
+  .long type				;	\
+1:.asciz "name"				;	\
+2:.align 4				;	\
+3:desctype descdata			;	\
+4:.align 4				;	\
+.popsection				;
 #else	/* !__ASSEMBLER__ */
 #include <linux/elf.h>
 /*