Linux Kernel Markers: create modpost file

[linux-2.6-omap-h63xx.git] / include / linux / marker.h

diff --git a/include/linux/marker.h b/include/linux/marker.h
index b5f95637f28946b9c26511f07ecae102e39b75df..5df879dc3776c732dc62e017850f0eb4739429e3 100644 (file)
--- a/include/linux/marker.h
+++ b/include/linux/marker.h
@@ -61,15 +61,12 @@ struct marker {
  */
 #define __trace_mark(name, call_private, format, args...)              \
        do {                                                            \
-               static const char __mstrtab_name_##name[]               \
+               static const char __mstrtab_##name[]                    \
                __attribute__((section("__markers_strings")))           \
-               = #name;                                                \
-               static const char __mstrtab_format_##name[]             \
-               __attribute__((section("__markers_strings")))           \
-               = format;                                               \
+               = #name "\0" format;                                    \
                static struct marker __mark_##name                      \
                __attribute__((section("__markers"), aligned(8))) =     \
-               { __mstrtab_name_##name, __mstrtab_format_##name,       \
+               { __mstrtab_##name, &__mstrtab_##name[sizeof(#name)],   \
                0, 0, marker_probe_cb,                                  \
                { __mark_empty_function, NULL}, NULL };                 \
                __mark_check_format(format, ## args);                   \