Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Merge upstream tree in order to reinstate crct10dif.

1 files changed, 3 insertions, 0 deletions

diff --git a/arch/x86/kernel/hw_breakpoint.c b/arch/x86/kernel/hw_breakpoint.c
index 02f07634d265..f66ff162dce8 100644
--- a/arch/x86/kernel/hw_breakpoint.c
+++ b/arch/x86/kernel/hw_breakpoint.c
@@ -393,6 +393,9 @@ void flush_ptrace_hw_breakpoint(struct task_struct *tsk)
                 unregister_hw_breakpoint(t->ptrace_bps[i]);
                 t->ptrace_bps[i] = NULL;
         }
+
+        t->debugreg6 = 0;
+        t->ptrace_dr7 = 0;
 }
 
 void hw_breakpoint_restore(void)