Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / x86 / kernel / traps.c

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 00516e1..02cfb9b 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -534,11 +534,11 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
 
        /* DR6 may or may not be cleared by the CPU */
        set_debugreg(0, 6);
 
        /* DR6 may or may not be cleared by the CPU */
        set_debugreg(0, 6);

+

        /*
         * The processor cleared BTF, so don't mark that we need it set.
         */
        /*
         * The processor cleared BTF, so don't mark that we need it set.
         */

-       clear_tsk_thread_flag(tsk, TIF_DEBUGCTLMSR);
-       tsk->thread.debugctlmsr = 0;
+       clear_tsk_thread_flag(tsk, TIF_BLOCKSTEP);

 
        /* Store the virtualized DR6 value */
        tsk->thread.debugreg6 = dr6;
 
        /* Store the virtualized DR6 value */
        tsk->thread.debugreg6 = dr6;