X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fmips%2Fkernel%2Fvmlinux.lds.S;h=2781cff1485ebc62dc934d51cf043084b7a67495;hb=56d61a0e26c5a61c66d1ac259a59960295939da9;hp=84f9a4cc6f2fe20b2ea4df6b637da31f3d082302;hpb=e3d18658d4f28e4783e1bb1c41e9134c9e5db0a9;p=linux-2.6-omap-h63xx.git

diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 84f9a4cc6f2..2781cff1485 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
@@ -21,7 +25,6 @@ SECTIONS
 	 *   >= 0xa800 0000 0030 0000 otherwise
 	 */
 
-	/* . = 0xa800000000300000; */
 	/* . = 0xa800000000300000; */
 	. = 0xffffffff80300000;
 #endif
@@ -32,9 +35,10 @@ SECTIONS
 		TEXT_TEXT
 		SCHED_TEXT
 		LOCK_TEXT
+		KPROBES_TEXT
 		*(.fixup)
 		*(.gnu.warning)
-	} =0
+	} :text = 0
 	_etext = .;	/* End of text section */
 
 	/* Exception table */
@@ -51,6 +55,10 @@ SECTIONS
 		*(__dbe_table)
 		__stop___dbe_table = .;
 	}
+
+	NOTES :text :note
+	.dummy : { *(.dummy) } :text
+
 	RODATA
 
 	/* writeable */
@@ -201,7 +209,4 @@ SECTIONS
 		*(.gptab.bss)
 		*(.gptab.sbss)
 	}
-	.note : {
-		*(.note)
-	}
 }