git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
traps.c
diff --git
a/arch/x86_64/kernel/traps.c
b/arch/x86_64/kernel/traps.c
index
2df603e
..
6d38a2d
100644
(file)
--- a/
arch/x86_64/kernel/traps.c
+++ b/
arch/x86_64/kernel/traps.c
@@
-931,6
+931,14
@@
asmlinkage void __kprobes do_debug(struct pt_regs * regs,
*/
if (!user_mode(regs))
goto clear_TF_reenable;
*/
if (!user_mode(regs))
goto clear_TF_reenable;
+ /*
+ * 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 */
}
/* Ok, finally something we can handle */