[PATCH] xen: x86: Use new macro for debugreg

Make use of the 2 new macro set_debugreg and get_debugreg.

Signed-off-by: Vincent Hanquez <vincent.hanquez@cl.cam.ac.uk>
Cc: Ian Pratt <m+Ian.Pratt@cl.cam.ac.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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)
         unsigned int condition;
         struct task_struct *tsk = current;
 
-        __asm__ __volatile__("movl %%db6,%0" : "=r" (condition));
+        get_debugreg(condition, 6);
 
         if (notify_die(DIE_DEBUG, "debug", regs, condition, error_code,
                                         SIGTRAP) == NOTIFY_STOP)
@@ -727,9 +727,7 @@ fastcall void do_debug(struct pt_regs * regs, long error_code)
          * the signal is delivered.
          */
 clear_dr7:
-        __asm__("movl %0,%%db7"
-                : /* no output */
-                : "r" (0));
+        set_debugreg(0, 7);
         return;
 
 debug_vm86: