diff --git a/[refs] b/[refs] index 604163e42e4f..2970c90ce1a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e7ca9a22dbbc5c91763cd16923c7509918709b6 +refs/heads/master: 6a74aa40907757ec98d8710ff66cd4cfe064e7d8 diff --git a/trunk/include/trace/ftrace.h b/trunk/include/trace/ftrace.h index 5a7d18c43634..a77f71a46dbe 100644 --- a/trunk/include/trace/ftrace.h +++ b/trunk/include/trace/ftrace.h @@ -123,7 +123,7 @@ #define TP_printk(fmt, args...) fmt "\n", args #undef __get_str -#define __get_str(field) (char *)__entry + __entry->__str_loc_##field +#define __get_str(field) ((char *)__entry + __entry->__str_loc_##field) #undef TRACE_EVENT #define TRACE_EVENT(call, proto, args, tstruct, assign, print) \