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-xen.c

diff --git a/arch/x86_64/kernel/traps-xen.c b/arch/x86_64/kernel/traps-xen.c
index a551b73..13c6d3d 100644 (file)
--- a/arch/x86_64/kernel/traps-xen.c
+++ b/arch/x86_64/kernel/traps-xen.c
@@ -115,7 +115,6 @@ static int call_trace = 1;
 #define call_trace (-1)
 #endif
 
-
 #ifdef CONFIG_KALLSYMS
 # include <linux/kallsyms.h>
 void printk_address(unsigned long address)
@@ -182,7 +181,7 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
                        break;
 #endif
                default:
-                       end = per_cpu(orig_tss, cpu).ist[k];
+                       end = per_cpu(orig_ist, cpu).ist[k];
                        break;
                }
                /*
@@ -936,6 +935,14 @@ asmlinkage void __kprobes do_debug(struct pt_regs * regs,
                 */
                 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 */