1 files changed, 10 insertions, 5 deletions

diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 84f9a4cc6f2f..2781cff1485e 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
@@ -22,7 +26,6 @@ SECTIONS
          */
 
         /* . = 0xa800000000300000; */
-        /* . = 0xa800000000300000; */
         . = 0xffffffff80300000;
 #endif
         . = LOADADDR;
@@ -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)
-        }
 }