[POWERPC] spufs: fix order of sputrace thread IDs

Currently, we get the following output from sputrace:

[5.097935954] 1606: spufs_ps_nopfn__enter (thread = 1605, spu = -1)
[5.097958164] 1606: spufs_ps_nopfn__insert (thread = 1605, spu = 15)
[5.097973529] 1607: spufs_ps_nopfn__enter (thread = 1605, spu = -1)
[5.097989174] 1607: spufs_ps_nopfn__insert (thread = 1605, spu = 14)

Which leads me to believe that 160[67] is the current thread ID, and
1605 is the context backing the psmap.

However, the 'current' and 'owner' tids are reversed - the 'current'
tid is on the right. This change puts the current thread ID in the
left-hand column instead, and renames the right to 'ctxthread'.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/arch/powerpc/platforms/cell/spufs/sputrace.c b/arch/powerpc/platforms/cell/spufs/sputrace.c
index 01974f7776e184d798d33cb2728dc5c610cad368..79aa773f3c992abff92f38f51608bdcc5497c0a1 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/sputrace.c
+++ b/arch/powerpc/platforms/cell/spufs/sputrace.c
@@ -58,12 +58,12 @@ static int sputrace_sprint(char *tbuf, int n)
                ktime_to_timespec(ktime_sub(t->tstamp, sputrace_start));
 
        return snprintf(tbuf, n,
-               "[%lu.%09lu] %d: %s (thread = %d, spu = %d)\n",
+               "[%lu.%09lu] %d: %s (ctxthread = %d, spu = %d)\n",
                (unsigned long) tv.tv_sec,
                (unsigned long) tv.tv_nsec,
-               t->owner_tid,
-               t->name,
                t->curr_tid,
+               t->name,
+               t->owner_tid,
                t->number);
 }
 
@@ -188,6 +188,7 @@ struct spu_probe spu_probes[] = {
        { "spufs_ps_nopfn__insert", "%p %p", spu_context_event },
        { "spu_acquire_saved__enter", "%p", spu_context_nospu_event },
        { "destroy_spu_context__enter", "%p", spu_context_nospu_event },
+       { "spufs_stop_callback__enter", "%p %p", spu_context_event },
 };
 
 static int __init sputrace_init(void)