Commit 1cc6f12e authored by Vincent Hanquez's avatar Vincent Hanquez Committed by Linus Torvalds

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

Make use of the 2 new macro set_debugreg and get_debugreg.
Signed-off-by: default avatarVincent Hanquez <vincent.hanquez@cl.cam.ac.uk>
Cc: Ian Pratt <m+Ian.Pratt@cl.cam.ac.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f5012310
...@@ -635,7 +635,7 @@ void __init cpu_init (void) ...@@ -635,7 +635,7 @@ void __init cpu_init (void)
/* Clear all 6 debug registers: */ /* Clear all 6 debug registers: */
#define CD(register) __asm__("movl %0,%%db" #register ::"r"(0) ); #define CD(register) set_debugreg(0, register)
CD(0); CD(1); CD(2); CD(3); /* no db4 and db5 */; CD(6); CD(7); CD(0); CD(1); CD(2); CD(3); /* no db4 and db5 */; CD(6); CD(7);
......
...@@ -633,13 +633,13 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas ...@@ -633,13 +633,13 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas
* Now maybe reload the debug registers * Now maybe reload the debug registers
*/ */
if (unlikely(next->debugreg[7])) { if (unlikely(next->debugreg[7])) {
loaddebug(next, 0); set_debugreg(current->thread.debugreg[0], 0);
loaddebug(next, 1); set_debugreg(current->thread.debugreg[1], 1);
loaddebug(next, 2); set_debugreg(current->thread.debugreg[2], 2);
loaddebug(next, 3); set_debugreg(current->thread.debugreg[3], 3);
/* no 4 and 5 */ /* no 4 and 5 */
loaddebug(next, 6); set_debugreg(current->thread.debugreg[6], 6);
loaddebug(next, 7); set_debugreg(current->thread.debugreg[7], 7);
} }
if (unlikely(prev->io_bitmap_ptr || next->io_bitmap_ptr)) if (unlikely(prev->io_bitmap_ptr || next->io_bitmap_ptr))
......
...@@ -624,7 +624,7 @@ int fastcall do_signal(struct pt_regs *regs, sigset_t *oldset) ...@@ -624,7 +624,7 @@ int fastcall do_signal(struct pt_regs *regs, sigset_t *oldset)
* inside the kernel. * inside the kernel.
*/ */
if (unlikely(current->thread.debugreg[7])) { if (unlikely(current->thread.debugreg[7])) {
loaddebug(&current->thread, 7); set_debugreg(current->thread.debugreg[7], 7);
} }
/* Whee! Actually deliver the signal. */ /* Whee! Actually deliver the signal. */
......
...@@ -685,7 +685,7 @@ fastcall void do_debug(struct pt_regs * regs, long error_code) ...@@ -685,7 +685,7 @@ fastcall void do_debug(struct pt_regs * regs, long error_code)
unsigned int condition; unsigned int condition;
struct task_struct *tsk = current; 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, if (notify_die(DIE_DEBUG, "debug", regs, condition, error_code,
SIGTRAP) == NOTIFY_STOP) SIGTRAP) == NOTIFY_STOP)
...@@ -727,9 +727,7 @@ fastcall void do_debug(struct pt_regs * regs, long error_code) ...@@ -727,9 +727,7 @@ fastcall void do_debug(struct pt_regs * regs, long error_code)
* the signal is delivered. * the signal is delivered.
*/ */
clear_dr7: clear_dr7:
__asm__("movl %0,%%db7" set_debugreg(0, 7);
: /* no output */
: "r" (0));
return; return;
debug_vm86: debug_vm86:
......
...@@ -94,13 +94,13 @@ static void fix_processor_context(void) ...@@ -94,13 +94,13 @@ static void fix_processor_context(void)
* Now maybe reload the debug registers * Now maybe reload the debug registers
*/ */
if (current->thread.debugreg[7]){ if (current->thread.debugreg[7]){
loaddebug(&current->thread, 0); set_debugreg(current->thread.debugreg[0], 0);
loaddebug(&current->thread, 1); set_debugreg(current->thread.debugreg[1], 1);
loaddebug(&current->thread, 2); set_debugreg(current->thread.debugreg[2], 2);
loaddebug(&current->thread, 3); set_debugreg(current->thread.debugreg[3], 3);
/* no 4 and 5 */ /* no 4 and 5 */
loaddebug(&current->thread, 6); set_debugreg(current->thread.debugreg[6], 6);
loaddebug(&current->thread, 7); set_debugreg(current->thread.debugreg[7], 7);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment