[POWERPC] spufs: add sputrace marker parameter names

The markers facility defines the marker parameters to be of the form
'name %format'. Add parameter names to sputrace, to specify the context
and %spu paramerters,  instead of just specifying the '%format' part.

Signed-off-by: Julio M. Merino Vidal <jmerino@ac.upc.edu>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index dd63b16..7312745 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -359,8 +359,8 @@ extern void spuctx_switch_state(struct spu_context *ctx,
                enum spu_utilization_state new_state);
 
 #define spu_context_trace(name, ctx, spu) \
-       trace_mark(name, "%p %p", ctx, spu);
+       trace_mark(name, "ctx %p spu %p", ctx, spu);
 #define spu_context_nospu_trace(name, ctx) \
-       trace_mark(name, "%p", ctx);
+       trace_mark(name, "ctx %p", ctx);
 
 #endif

diff --git a/arch/powerpc/platforms/cell/spufs/sputrace.c b/arch/powerpc/platforms/cell/spufs/sputrace.c
index 79aa773..b9c79ed 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/sputrace.c
+++ b/arch/powerpc/platforms/cell/spufs/sputrace.c
@@ -171,24 +171,24 @@ static void spu_context_nospu_event(void *probe_private, void *call_data,
 }
 
 struct spu_probe spu_probes[] = {
-       { "spu_bind_context__enter", "%p %p", spu_context_event },
-       { "spu_unbind_context__enter", "%p %p", spu_context_event },
-       { "spu_get_idle__enter", "%p", spu_context_nospu_event },
-       { "spu_get_idle__found", "%p %p", spu_context_event },
-       { "spu_get_idle__not_found", "%p", spu_context_nospu_event },
-       { "spu_find_victim__enter", "%p", spu_context_nospu_event },
-       { "spusched_tick__preempt", "%p %p", spu_context_event },
-       { "spusched_tick__newslice", "%p", spu_context_nospu_event },
-       { "spu_yield__enter", "%p", spu_context_nospu_event },
-       { "spu_deactivate__enter", "%p", spu_context_nospu_event },
-       { "__spu_deactivate__unload", "%p %p", spu_context_event },
-       { "spufs_ps_nopfn__enter", "%p", spu_context_nospu_event },
-       { "spufs_ps_nopfn__sleep", "%p", spu_context_nospu_event },
-       { "spufs_ps_nopfn__wake", "%p %p", spu_context_event },
-       { "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 },
+       { "spu_bind_context__enter", "ctx %p spu %p", spu_context_event },
+       { "spu_unbind_context__enter", "ctx %p spu %p", spu_context_event },
+       { "spu_get_idle__enter", "ctx %p", spu_context_nospu_event },
+       { "spu_get_idle__found", "ctx %p spu %p", spu_context_event },
+       { "spu_get_idle__not_found", "ctx %p", spu_context_nospu_event },
+       { "spu_find_victim__enter", "ctx %p", spu_context_nospu_event },
+       { "spusched_tick__preempt", "ctx %p spu %p", spu_context_event },
+       { "spusched_tick__newslice", "ctx %p", spu_context_nospu_event },
+       { "spu_yield__enter", "ctx %p", spu_context_nospu_event },
+       { "spu_deactivate__enter", "ctx %p", spu_context_nospu_event },
+       { "__spu_deactivate__unload", "ctx %p spu %p", spu_context_event },
+       { "spufs_ps_nopfn__enter", "ctx %p", spu_context_nospu_event },
+       { "spufs_ps_nopfn__sleep", "ctx %p", spu_context_nospu_event },
+       { "spufs_ps_nopfn__wake", "ctx %p spu %p", spu_context_event },
+       { "spufs_ps_nopfn__insert", "ctx %p spu %p", spu_context_event },
+       { "spu_acquire_saved__enter", "ctx %p", spu_context_nospu_event },
+       { "destroy_spu_context__enter", "ctx %p", spu_context_nospu_event },
+       { "spufs_stop_callback__enter", "ctx %p spu %p", spu_context_event },
 };
 
 static int __init sputrace_init(void)