1 files changed, 4 insertions, 0 deletions

diff --git a/arch/mips/kernel/ftrace.c b/arch/mips/kernel/ftrace.c
index 374ed74cd516..74fe73506d8f 100644
--- a/arch/mips/kernel/ftrace.c
+++ b/arch/mips/kernel/ftrace.c
@@ -90,6 +90,7 @@ static inline void ftrace_dyn_arch_init_insns(void)
 static int ftrace_modify_code(unsigned long ip, unsigned int new_code)
 {
         int faulted;
+        mm_segment_t old_fs;
 
         /* *(unsigned int *)ip = new_code; */
         safe_store_code(new_code, ip, faulted);
@@ -97,7 +98,10 @@ static int ftrace_modify_code(unsigned long ip, unsigned int new_code)
         if (unlikely(faulted))
                 return -EFAULT;
 
+        old_fs = get_fs();
+        set_fs(get_ds());
         flush_icache_range(ip, ip + 8);
+        set_fs(old_fs);
 
         return 0;
 }