1 files changed, 3 insertions, 9 deletions

diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index e510618b2e91..a7bc79480719 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -364,18 +364,12 @@ static int set_segment_reg(struct task_struct *task,
         case offsetof(struct user_regs_struct,cs):
                 if (unlikely(value == 0))
                         return -EIO;
-#ifdef CONFIG_IA32_EMULATION
-                if (test_tsk_thread_flag(task, TIF_IA32))
-                        task_pt_regs(task)->cs = value;
-#endif
+                task_pt_regs(task)->cs = value;
                 break;
         case offsetof(struct user_regs_struct,ss):
                 if (unlikely(value == 0))
                         return -EIO;
-#ifdef CONFIG_IA32_EMULATION
-                if (test_tsk_thread_flag(task, TIF_IA32))
-                        task_pt_regs(task)->ss = value;
-#endif
+                task_pt_regs(task)->ss = value;
                 break;
         }
 
@@ -1421,7 +1415,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
         memset(info, 0, sizeof(*info));
         info->si_signo = SIGTRAP;
         info->si_code = si_code;
-        info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
+        info->si_addr = user_mode(regs) ? (void __user *)regs->ip : NULL;
 }
 
 void user_single_step_siginfo(struct task_struct *tsk,