1 files changed, 7 insertions, 1 deletions

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 12ecc817be3f..3727537f5825 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -58,6 +58,12 @@
 
         .endm
 
+#ifdef CONFIG_KPROBES
+        .section        .kprobes.text,"ax",%progbits
+#else
+        .text
+#endif
+
 /*
  * Invalid mode handlers
  */
@@ -562,7 +568,7 @@ do_fpe:
         .data
 ENTRY(fp_enter)
         .word   no_fp
-        .text
+        .previous
 
 no_fp:  mov     pc, lr