diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/marker.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/marker.h b/include/linux/marker.h index b5f95637f289..5df879dc3776 100644 --- a/include/linux/marker.h +++ b/include/linux/marker.h | |||
@@ -61,15 +61,12 @@ struct marker { | |||
61 | */ | 61 | */ |
62 | #define __trace_mark(name, call_private, format, args...) \ | 62 | #define __trace_mark(name, call_private, format, args...) \ |
63 | do { \ | 63 | do { \ |
64 | static const char __mstrtab_name_##name[] \ | 64 | static const char __mstrtab_##name[] \ |
65 | __attribute__((section("__markers_strings"))) \ | 65 | __attribute__((section("__markers_strings"))) \ |
66 | = #name; \ | 66 | = #name "\0" format; \ |
67 | static const char __mstrtab_format_##name[] \ | ||
68 | __attribute__((section("__markers_strings"))) \ | ||
69 | = format; \ | ||
70 | static struct marker __mark_##name \ | 67 | static struct marker __mark_##name \ |
71 | __attribute__((section("__markers"), aligned(8))) = \ | 68 | __attribute__((section("__markers"), aligned(8))) = \ |
72 | { __mstrtab_name_##name, __mstrtab_format_##name, \ | 69 | { __mstrtab_##name, &__mstrtab_##name[sizeof(#name)], \ |
73 | 0, 0, marker_probe_cb, \ | 70 | 0, 0, marker_probe_cb, \ |
74 | { __mark_empty_function, NULL}, NULL }; \ | 71 | { __mark_empty_function, NULL}, NULL }; \ |
75 | __mark_check_format(format, ## args); \ | 72 | __mark_check_format(format, ## args); \ |