Merge branch 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[sfrench/cifs-2.6.git] / include / trace / ftrace.h

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 26b4f2e13275d13246ef8709919cf1ab7e83247a..139b5067345b2ecb2daa1881d8b484ad76cf382a 100644 (file)
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -277,14 +277,12 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags,  \
        field = (typeof(field))iter->ent;                               \
                                                                        \
        ret = ftrace_raw_output_prep(iter, trace_event);                \
-       if (ret)                                                        \
+       if (ret != TRACE_TYPE_HANDLED)                                  \
                return ret;                                             \
                                                                        \
-       ret = trace_seq_printf(s, print);                               \
-       if (!ret)                                                       \
-               return TRACE_TYPE_PARTIAL_LINE;                         \
+       trace_seq_printf(s, print);                                     \
                                                                        \
-       return TRACE_TYPE_HANDLED;                                      \
+       return trace_handle_return(s);                                  \
 }                                                                      \
 static struct trace_event_functions ftrace_event_type_funcs_##call = { \
        .trace                  = ftrace_raw_output_##call,             \