From 603bb99c8bca114fcd586271b19fa9fe65877b62 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 14 Oct 2007 22:49:01 +0100
Subject: [PATCH] [MIPS] vmlinux.lds.S: Fix handling of .notes in final link.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
 arch/mips/kernel/vmlinux.lds.S | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 03ad46e24563..33581387d662 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -5,6 +5,10 @@
 #define mips mips
 OUTPUT_ARCH(mips)
 ENTRY(kernel_entry)
+PHDRS {
+	text PT_LOAD FLAGS(7);	/* RWX */
+	note PT_NOTE FLAGS(4);	/* R__ */
+}
 jiffies = JIFFIES;
 
 SECTIONS
@@ -33,7 +37,7 @@ SECTIONS
 		LOCK_TEXT
 		*(.fixup)
 		*(.gnu.warning)
-	} =0
+	} :text = 0
 	_etext = .;	/* End of text section */
 
 	/* Exception table */
@@ -50,6 +54,10 @@ SECTIONS
 		*(__dbe_table)
 		__stop___dbe_table = .;
 	}
+
+	NOTES :text :note
+	.dummy : { *(.dummy) } :text
+
 	RODATA
 
 	/* writeable */
@@ -200,7 +208,4 @@ SECTIONS
 		*(.gptab.bss)
 		*(.gptab.sbss)
 	}
-	.note : {
-		*(.note)
-	}
 }