4 files changed, 51 insertions, 28 deletions

diff --git a/arch/tile/kernel/intvec_32.S b/arch/tile/kernel/intvec_32.S
index f212bf7cea86..cb52d66343ed 100644
--- a/arch/tile/kernel/intvec_32.S
+++ b/arch/tile/kernel/intvec_32.S
@@ -1201,7 +1201,10 @@ handle_syscall:
         lw      r30, r31
         andi    r30, r30, _TIF_SYSCALL_TRACE
         bzt     r30, .Lrestore_syscall_regs
-        jal     do_syscall_trace
+        {
+         PTREGS_PTR(r0, PTREGS_OFFSET_BASE)
+         jal    do_syscall_trace_enter
+        }
         FEEDBACK_REENTER(handle_syscall)
 
         /*
@@ -1252,7 +1255,10 @@ handle_syscall:
         lw      r30, r31
         andi    r30, r30, _TIF_SYSCALL_TRACE
         bzt     r30, 1f
-        jal     do_syscall_trace
+        {
+         PTREGS_PTR(r0, PTREGS_OFFSET_BASE)
+         jal    do_syscall_trace_exit
+        }
         FEEDBACK_REENTER(handle_syscall)
 1:      {
          movei  r30, 0               /* not an NMI */
diff --git a/arch/tile/kernel/intvec_64.S b/arch/tile/kernel/intvec_64.S
index 4ea080902654..85d483957027 100644
--- a/arch/tile/kernel/intvec_64.S
+++ b/arch/tile/kernel/intvec_64.S
@@ -1000,13 +1000,19 @@ handle_syscall:
 
         /* Trace syscalls, if requested. */
         addi    r31, r31, THREAD_INFO_FLAGS_OFFSET
-        ld      r30, r31
-        andi    r30, r30, _TIF_SYSCALL_TRACE
+        {
+         ld     r30, r31
+         moveli r32, _TIF_SYSCALL_ENTRY_WORK
+        }
+        and     r30, r30, r32
         {
          addi   r30, r31, THREAD_INFO_STATUS_OFFSET - THREAD_INFO_FLAGS_OFFSET
          beqzt  r30, .Lrestore_syscall_regs
         }
-        jal     do_syscall_trace
+        {
+         PTREGS_PTR(r0, PTREGS_OFFSET_BASE)
+         jal    do_syscall_trace_enter
+        }
         FEEDBACK_REENTER(handle_syscall)
 
         /*
@@ -1071,13 +1077,19 @@ handle_syscall:
         FEEDBACK_REENTER(handle_syscall)
 
         /* Do syscall trace again, if requested. */
-        ld      r30, r31
-        andi    r0, r30, _TIF_SYSCALL_TRACE
+        {
+         ld      r30, r31
+         moveli  r32, _TIF_SYSCALL_EXIT_WORK
+        }
+        and      r0, r30, r32
         {
          andi    r0, r30, _TIF_SINGLESTEP
          beqzt   r0, 1f
         }
-        jal     do_syscall_trace
+        {
+         PTREGS_PTR(r0, PTREGS_OFFSET_BASE)
+         jal    do_syscall_trace_exit
+        }
         FEEDBACK_REENTER(handle_syscall)
         andi    r0, r30, _TIF_SINGLESTEP
 
diff --git a/arch/tile/kernel/ptrace.c b/arch/tile/kernel/ptrace.c
index 9835312d5a91..0f83ed4602b2 100644
--- a/arch/tile/kernel/ptrace.c
+++ b/arch/tile/kernel/ptrace.c
@@ -21,9 +21,13 @@
 #include <linux/uaccess.h>
 #include <linux/regset.h>
 #include <linux/elf.h>
+#include <linux/tracehook.h>
 #include <asm/traps.h>
 #include <arch/chip.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/syscalls.h>
+
 void user_enable_single_step(struct task_struct *child)
 {
         set_tsk_thread_flag(child, TIF_SINGLESTEP);
@@ -246,29 +250,26 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
 }
 #endif
 
-void do_syscall_trace(void)
+int do_syscall_trace_enter(struct pt_regs *regs)
 {
-        if (!test_thread_flag(TIF_SYSCALL_TRACE))
-                return;
+        if (test_thread_flag(TIF_SYSCALL_TRACE)) {
+                if (tracehook_report_syscall_entry(regs))
+                        regs->regs[TREG_SYSCALL_NR] = -1;
+        }
 
-        if (!(current->ptrace & PT_PTRACED))
-                return;
+        if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
+                trace_sys_enter(regs, regs->regs[TREG_SYSCALL_NR]);
 
-        /*
-         * The 0x80 provides a way for the tracing parent to distinguish
-         * between a syscall stop and SIGTRAP delivery
-         */
-        ptrace_notify(SIGTRAP|((current->ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
+        return regs->regs[TREG_SYSCALL_NR];
+}
 
-        /*
-         * this isn't the same as continuing with a signal, but it will do
-         * for normal use.  strace only continues with a signal if the
-         * stopping signal is not SIGTRAP.  -brl
-         */
-        if (current->exit_code) {
-                send_sig(current->exit_code, current, 1);
-                current->exit_code = 0;
-        }
+void do_syscall_trace_exit(struct pt_regs *regs)
+{
+        if (test_thread_flag(TIF_SYSCALL_TRACE))
+                tracehook_report_syscall_exit(regs, 0);
+
+        if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
+                trace_sys_exit(regs, regs->regs[0]);
 }
 
 void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index f6f50f2a5e37..5ac397ec6986 100644
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -230,6 +230,10 @@ int setup_profiling_timer(unsigned int multiplier)
  */
 cycles_t ns2cycles(unsigned long nsecs)
 {
-        struct clock_event_device *dev = &__get_cpu_var(tile_timer);
+        /*
+         * We do not have to disable preemption here as each core has the same
+         * clock frequency.
+         */
+        struct clock_event_device *dev = &__raw_get_cpu_var(tile_timer);
         return ((u64)nsecs * dev->mult) >> dev->shift;
 }