6 files changed, 565 insertions, 236 deletions

diff --git a/arch/powerpc/platforms/cell/spufs/sputrace.c b/arch/powerpc/platforms/cell/spufs/sputrace.c
index 2b1953f6f12e..01974f7776e1 100644
--- a/arch/powerpc/platforms/cell/spufs/sputrace.c
+++ b/arch/powerpc/platforms/cell/spufs/sputrace.c
@@ -146,34 +146,28 @@ static void sputrace_log_item(const char *name, struct spu_context *ctx,
         wake_up(&sputrace_wait);
 }
 
-static void spu_context_event(const struct marker *mdata,
-                void *private, const char *format, ...)
+static void spu_context_event(void *probe_private, void *call_data,
+                const char *format, va_list *args)
 {
-        struct spu_probe *p = mdata->private;
-        va_list ap;
+        struct spu_probe *p = probe_private;
         struct spu_context *ctx;
         struct spu *spu;
 
-        va_start(ap, format);
-        ctx = va_arg(ap, struct spu_context *);
-        spu = va_arg(ap, struct spu *);
+        ctx = va_arg(*args, struct spu_context *);
+        spu = va_arg(*args, struct spu *);
 
         sputrace_log_item(p->name, ctx, spu);
-        va_end(ap);
 }
 
-static void spu_context_nospu_event(const struct marker *mdata,
-                void *private, const char *format, ...)
+static void spu_context_nospu_event(void *probe_private, void *call_data,
+                const char *format, va_list *args)
 {
-        struct spu_probe *p = mdata->private;
-        va_list ap;
+        struct spu_probe *p = probe_private;
         struct spu_context *ctx;
 
-        va_start(ap, format);
-        ctx = va_arg(ap, struct spu_context *);
+        ctx = va_arg(*args, struct spu_context *);
 
         sputrace_log_item(p->name, ctx, NULL);
-        va_end(ap);
 }
 
 struct spu_probe spu_probes[] = {
@@ -219,10 +213,6 @@ static int __init sputrace_init(void)
                 if (error)
                         printk(KERN_INFO "Unable to register probe %s\n",
                                         p->name);
-
-                error = marker_arm(p->name);
-                if (error)
-                        printk(KERN_INFO "Unable to arm probe %s\n", p->name);
         }
 
         return 0;
@@ -238,7 +228,8 @@ static void __exit sputrace_exit(void)
         int i;
 
         for (i = 0; i < ARRAY_SIZE(spu_probes); i++)
-                marker_probe_unregister(spu_probes[i].name);
+                marker_probe_unregister(spu_probes[i].name,
+                        spu_probes[i].probe_func, &spu_probes[i]);
 
         remove_proc_entry("sputrace", NULL);
         kfree(sputrace_log);
diff --git a/include/linux/marker.h b/include/linux/marker.h
index 5f36cf946bcb..b5f95637f289 100644
--- a/include/linux/marker.h
+++ b/include/linux/marker.h
@@ -19,16 +19,23 @@ struct marker;
 
 /**
  * marker_probe_func - Type of a marker probe function
- * @mdata: pointer of type struct marker
- * @private_data: caller site private data
+ * @probe_private: probe private data
+ * @call_private: call site private data
  * @fmt: format string
- * @...: variable argument list
+ * @args: variable argument list pointer. Use a pointer to overcome C's
+ *        inability to pass this around as a pointer in a portable manner in
+ *        the callee otherwise.
  *
  * Type of marker probe functions. They receive the mdata and need to parse the
  * format string to recover the variable argument list.
  */
-typedef void marker_probe_func(const struct marker *mdata,
-        void *private_data, const char *fmt, ...);
+typedef void marker_probe_func(void *probe_private, void *call_private,
+                const char *fmt, va_list *args);
+
+struct marker_probe_closure {
+        marker_probe_func *func;        /* Callback */
+        void *probe_private;            /* Private probe data */
+};
 
 struct marker {
         const char *name;       /* Marker name */
@@ -36,8 +43,11 @@ struct marker {
                                  * variable argument list.
                                  */
         char state;             /* Marker state. */
-        marker_probe_func *call;/* Probe handler function pointer */
-        void *private;          /* Private probe data */
+        char ptype;             /* probe type : 0 : single, 1 : multi */
+        void (*call)(const struct marker *mdata,        /* Probe wrapper */
+                void *call_private, const char *fmt, ...);
+        struct marker_probe_closure single;
+        struct marker_probe_closure *multi;
 } __attribute__((aligned(8)));
 
 #ifdef CONFIG_MARKERS
@@ -49,7 +59,7 @@ struct marker {
  * not add unwanted padding between the beginning of the section and the
  * structure. Force alignment to the same alignment as the section start.
  */
-#define __trace_mark(name, call_data, format, args...)                  \
+#define __trace_mark(name, call_private, format, args...)               \
         do {                                                            \
                 static const char __mstrtab_name_##name[]               \
                 __attribute__((section("__markers_strings")))           \
@@ -60,24 +70,23 @@ struct marker {
                 static struct marker __mark_##name                      \
                 __attribute__((section("__markers"), aligned(8))) =     \
                 { __mstrtab_name_##name, __mstrtab_format_##name,       \
-                0, __mark_empty_function, NULL };                       \
+                0, 0, marker_probe_cb,                                  \
+                { __mark_empty_function, NULL}, NULL };                 \
                 __mark_check_format(format, ## args);                   \
                 if (unlikely(__mark_##name.state)) {                    \
-                        preempt_disable();                              \
                         (*__mark_##name.call)                           \
-                                (&__mark_##name, call_data,             \
+                                (&__mark_##name, call_private,          \
                                 format, ## args);                       \
-                        preempt_enable();                               \
                 }                                                       \
         } while (0)
 
 extern void marker_update_probe_range(struct marker *begin,
-        struct marker *end, struct module *probe_module, int *refcount);
+        struct marker *end);
 #else /* !CONFIG_MARKERS */
-#define __trace_mark(name, call_data, format, args...) \
+#define __trace_mark(name, call_private, format, args...) \
                 __mark_check_format(format, ## args)
 static inline void marker_update_probe_range(struct marker *begin,
-        struct marker *end, struct module *probe_module, int *refcount)
+        struct marker *end)
 { }
 #endif /* CONFIG_MARKERS */
 
@@ -92,8 +101,6 @@ static inline void marker_update_probe_range(struct marker *begin,
 #define trace_mark(name, format, args...) \