Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[sfrench/cifs-2.6.git] / samples / markers / probe-example.c

diff --git a/samples/markers/probe-example.c b/samples/markers/probe-example.c
index 238b2e384fc84187e7c7d63143c02a5cb42992ce..a36797535615dc77647260f12d2496d850bd4177 100644 (file)
--- a/samples/markers/probe-example.c
+++ b/samples/markers/probe-example.c
@@ -53,7 +53,7 @@ void probe_subsystem_eventb(const struct marker *mdata, void *private,
 static struct probe_data probe_array[] =
 {
        {       .name = "subsystem_event",
-               .format = "%d %s",
+               .format = "integer %d string %s",
                .probe_func = probe_subsystem_event },
        {       .name = "subsystem_eventb",
                .format = MARK_NOARGS,