1 files changed, 8 insertions, 2 deletions

diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86_64/ia32/ptrace32.c
index 659c0722f6b8..d18198ed636b 100644
--- a/arch/x86_64/ia32/ptrace32.c
+++ b/arch/x86_64/ia32/ptrace32.c
@@ -117,6 +117,10 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 val)
                         if ((0x5454 >> ((val >> (16 + 4*i)) & 0xf)) & 1)
                                return -EIO;
                 child->thread.debugreg7 = val; 
+                if (val)
+                        set_tsk_thread_flag(child, TIF_DEBUG);
+                else
+                        clear_tsk_thread_flag(child, TIF_DEBUG);
                 break; 
                     
         default:
@@ -371,8 +375,10 @@ asmlinkage long sys32_ptrace(long request, u32 pid, u32 addr, u32 data)
                 ret = -EIO;
                 if (!access_ok(VERIFY_READ, u, sizeof(*u)))
                         break;
-                /* no checking to be bug-to-bug compatible with i386 */
-                __copy_from_user(&child->thread.i387.fxsave, u, sizeof(*u));
+                /* no checking to be bug-to-bug compatible with i386. */
+                /* but silence warning */
+                if (__copy_from_user(&child->thread.i387.fxsave, u, sizeof(*u)))
+                        ;
                 set_stopped_child_used_math(child);
                 child->thread.i387.fxsave.mxcsr &= mxcsr_feature_mask;
                 ret = 0;