aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/traps.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/kernel/traps.c')
-rw-r--r--arch/i386/kernel/traps.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 7f729665d292..c01d7ba6d7e8 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -685,7 +685,7 @@ fastcall void do_debug(struct pt_regs * regs, long error_code)
685 unsigned int condition; 685 unsigned int condition;
686 struct task_struct *tsk = current; 686 struct task_struct *tsk = current;
687 687
688 __asm__ __volatile__("movl %%db6,%0" : "=r" (condition)); 688 get_debugreg(condition, 6);
689 689
690 if (notify_die(DIE_DEBUG, "debug", regs, condition, error_code, 690 if (notify_die(DIE_DEBUG, "debug", regs, condition, error_code,
691 SIGTRAP) == NOTIFY_STOP) 691 SIGTRAP) == NOTIFY_STOP)
@@ -727,9 +727,7 @@ fastcall void do_debug(struct pt_regs * regs, long error_code)
727 * the signal is delivered. 727 * the signal is delivered.
728 */ 728 */
729clear_dr7: 729clear_dr7:
730 __asm__("movl %0,%%db7" 730 set_debugreg(0, 7);
731 : /* no output */
732 : "r" (0));
733 return; 731 return;
734 732
735debug_vm86: 733debug_vm86: