From 44251c6c050e939336083985d7c26ca94c8a72f6 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 2 May 2007 19:27:17 +0200
Subject: [PATCH] --- yaml --- r: 53887 b: refs/heads/master c:
 03df4f6ee997589a84d5f9492c6419183724c710 h: refs/heads/master i:   53885:
 995ed1788d951ea5c8a941a01801f7c5389764aa   53883:
 b3db17e2900edc9f296dc8c60baab32e2ca9c87c   53879:
 a06182cf42c8ce95943533353a23f4dc51326346   53871:
 a1e3f00fab9e807030518954e99aff305ac27a29   53855:
 d451c2a0e9134d9f219a468529e970f534cf5b12   53823:
 e71bc54ed761faedeaf9bf2dfdd7176d55299543   53759:
 0a2949eb3d4d6500ad38d7f23976117850f5a779 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/i386/kernel/vmlinux.lds.S    | 2 +-
 trunk/include/asm-generic/vmlinux.lds.h | 2 +-
 trunk/include/linux/elfnote.h           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0e69aaa59271..f32010f54e4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21564fd2a3deb48200b595332f9ed4c9f311f2a7
+refs/heads/master: 03df4f6ee997589a84d5f9492c6419183724c710
diff --git a/trunk/arch/i386/kernel/vmlinux.lds.S b/trunk/arch/i386/kernel/vmlinux.lds.S
index 568caca87715..23e8614edeee 100644
--- a/trunk/arch/i386/kernel/vmlinux.lds.S
+++ b/trunk/arch/i386/kernel/vmlinux.lds.S
@@ -30,7 +30,7 @@ jiffies = jiffies_64;
 PHDRS {
 	text PT_LOAD FLAGS(5);	/* R_E */
 	data PT_LOAD FLAGS(7);	/* RWE */
-	note PT_NOTE FLAGS(4);	/* R__ */
+	note PT_NOTE FLAGS(0);	/* ___ */
 }
 SECTIONS
 {
diff --git a/trunk/include/asm-generic/vmlinux.lds.h b/trunk/include/asm-generic/vmlinux.lds.h
index 9fcc8d9fbb14..f3806a74c478 100644
--- a/trunk/include/asm-generic/vmlinux.lds.h
+++ b/trunk/include/asm-generic/vmlinux.lds.h
@@ -208,7 +208,7 @@
 	}
 
 #define NOTES								\
-		.notes : { *(.note.*) } :note
+	.notes : { *(.note.*) } :note
 
 #define INITCALLS							\
   	*(.initcall0.init)						\
diff --git a/trunk/include/linux/elfnote.h b/trunk/include/linux/elfnote.h
index 67396db141e8..9a1e0674e56c 100644
--- a/trunk/include/linux/elfnote.h
+++ b/trunk/include/linux/elfnote.h
@@ -39,12 +39,12 @@
  *      ELFNOTE(XYZCo, 12, .long, 0xdeadbeef)
  */
 #define ELFNOTE(name, type, desctype, descdata)	\
-.pushsection .note.name			;	\
+.pushsection .note.name, "",@note	;	\
   .align 4				;	\
   .long 2f - 1f		/* namesz */	;	\
   .long 4f - 3f		/* descsz */	;	\
   .long type				;	\
-1:.asciz "name"				;	\
+1:.asciz #name				;	\
 2:.align 4				;	\
 3:desctype descdata			;	\
 4:.align 4				;	\