Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 19 insertions, 12 deletions

diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c
index 952da83903da..5fd644da7f02 100644
--- a/arch/sh/kernel/ptrace_64.c
+++ b/arch/sh/kernel/ptrace_64.c
@@ -82,13 +82,13 @@ get_fpu_long(struct task_struct *task, unsigned long addr)
 
         if (last_task_used_math == task) {
                 enable_fpu();
-                save_fpu(task, regs);
+                save_fpu(task);
                 disable_fpu();
                 last_task_used_math = 0;
                 regs->sr |= SR_FD;
         }
 
-        tmp = ((long *)&task->thread.fpu)[addr / sizeof(unsigned long)];
+        tmp = ((long *)task->thread.xstate)[addr / sizeof(unsigned long)];
         return tmp;
 }
 
@@ -114,17 +114,16 @@ put_fpu_long(struct task_struct *task, unsigned long addr, unsigned long data)
         regs = (struct pt_regs*)((unsigned char *)task + THREAD_SIZE) - 1;
 
         if (!tsk_used_math(task)) {
-                fpinit(&task->thread.fpu.hard);
-                set_stopped_child_used_math(task);
+                init_fpu(task);
         } else if (last_task_used_math == task) {
                 enable_fpu();
-                save_fpu(task, regs);
+                save_fpu(task);
                 disable_fpu();
                 last_task_used_math = 0;
                 regs->sr |= SR_FD;
         }
 
-        ((long *)&task->thread.fpu)[addr / sizeof(unsigned long)] = data;
+        ((long *)task->thread.xstate)[addr / sizeof(unsigned long)] = data;
         return 0;
 }
 
@@ -133,6 +132,8 @@ void user_enable_single_step(struct task_struct *child)
         struct pt_regs *regs = child->thread.uregs;
 
         regs->sr |= SR_SSTEP;   /* auto-resetting upon exception */
+
+        set_tsk_thread_flag(child, TIF_SINGLESTEP);
 }
 
 void user_disable_single_step(struct task_struct *child)
@@ -140,6 +141,8 @@ void user_disable_single_step(struct task_struct *child)
         struct pt_regs *regs = child->thread.uregs;
 
         regs->sr &= ~SR_SSTEP;
+
+        clear_tsk_thread_flag(child, TIF_SINGLESTEP);
 }
 
 static int genregs_get(struct task_struct *target,
@@ -222,7 +225,7 @@ int fpregs_get(struct task_struct *target,
                 return ret;
 
         return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
-                                   &target->thread.fpu.hard, 0, -1);
+                                   &target->thread.xstate->hardfpu, 0, -1);
 }
 
 static int fpregs_set(struct task_struct *target,
@@ -239,7 +242,7 @@ static int fpregs_set(struct task_struct *target,
         set_stopped_child_used_math(target);
 
         return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
-                                  &target->thread.fpu.hard, 0, -1);
+                                  &target->thread.xstate->hardfpu, 0, -1);
 }
 
 static int fpregs_active(struct task_struct *target,
@@ -454,6 +457,8 @@ asmlinkage long long do_syscall_trace_enter(struct pt_regs *regs)
 
 asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)
 {
+        int step;
+
         if (unlikely(current->audit_context))
                 audit_syscall_exit(AUDITSC_RESULT(regs->regs[9]),
                                    regs->regs[9]);
@@ -461,8 +466,9 @@ asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)
         if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
                 trace_sys_exit(regs, regs->regs[9]);
 
-        if (test_thread_flag(TIF_SYSCALL_TRACE))
-                tracehook_report_syscall_exit(regs, 0);
+        step = test_thread_flag(TIF_SINGLESTEP);
+        if (step || test_thread_flag(TIF_SYSCALL_TRACE))
+                tracehook_report_syscall_exit(regs, step);
 }
 
 /* Called with interrupts disabled */
@@ -479,9 +485,10 @@ asmlinkage void do_single_step(unsigned long long vec, struct pt_regs *regs)
 }
 
 /* Called with interrupts disabled */
-asmlinkage void do_software_break_point(unsigned long long vec,
-                                        struct pt_regs *regs)
+BUILD_TRAP_HANDLER(breakpoint)
 {
+        TRAP_HANDLER_DECL;
+
         /* We need to forward step the PC, to counteract the backstep done
            in signal.c. */
         local_irq_enable();