diff options
| author | Andi Kleen <ak@suse.de> | 2005-04-17 00:24:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 00:24:57 +0200 |
| commit | be61bff789fe44bfb6d9282d8f7eccc860bdcfb6 (patch) | |
| tree | 6c11d1fe32e7811c923ca5c7c21b89a78b5dd52f /arch/x86_64/kernel/traps.c | |
| parent | [PATCH] x86_64: clean up ptrace single-stepping (diff) | |
| download | linux-be61bff789fe44bfb6d9282d8f7eccc860bdcfb6.tar.xz linux-be61bff789fe44bfb6d9282d8f7eccc860bdcfb6.zip | |
[PATCH] x86_64: Some fixes for single step handling
Ported from i386/Linus
Be more careful with TF handling to fix some copy protection codes in Wine
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/traps.c')
| -rw-r--r-- | arch/x86_64/kernel/traps.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c index 2707a27b81cd..09e4a6460e74 100644 --- a/arch/x86_64/kernel/traps.c +++ b/arch/x86_64/kernel/traps.c @@ -688,8 +688,14 @@ asmlinkage void *do_debug(struct pt_regs * regs, unsigned long error_code) */ if ((regs->cs & 3) == 0) goto clear_TF_reenable; - if ((tsk->ptrace & (PT_DTRACE|PT_PTRACED)) == PT_DTRACE) - goto clear_TF; + /* + * Was the TF flag set by a debugger? If so, clear it now, + * so that register information is correct. + */ + if (tsk->ptrace & PT_DTRACE) { + regs->eflags &= ~TF_MASK; + tsk->ptrace &= ~PT_DTRACE; + } } /* Ok, finally something we can handle */ |