trace: fix compilation for 4.1

[firefly-linux-kernel-4.4.55.git] / kernel / trace / trace_output.c

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index d03ecf65ad53374872521164e42b6961149251db..3bc4b6de0f4d1f46983f460756b1b4b4972636a9 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -864,13 +864,15 @@ static enum print_line_t trace_graph_ent_trace(struct trace_iterator *iter, int
 
        trace_assign_type(field, iter->ent);
 
-       if (!trace_seq_puts(s, "graph_ent: func="))
+       trace_seq_puts(s, "graph_ent: func=");
+       if (trace_seq_has_overflowed(s))
                return TRACE_TYPE_PARTIAL_LINE;
 
        if (!seq_print_ip_sym(s, field->graph_ent.func, flags))
                return TRACE_TYPE_PARTIAL_LINE;
 
-       if (!trace_seq_puts(s, "\n"))
+       trace_seq_puts(s, "\n");
+       if (trace_seq_has_overflowed(s))
                return TRACE_TYPE_PARTIAL_LINE;
 
        return TRACE_TYPE_HANDLED;
@@ -883,9 +885,10 @@ static enum print_line_t trace_graph_ent_raw(struct trace_iterator *iter, int fl
 
        trace_assign_type(field, iter->ent);
 
-       if (!trace_seq_printf(&iter->seq, "%lx %d\n",
+       trace_seq_printf(&iter->seq, "%lx %d\n",
                              field->graph_ent.func,
-                             field->graph_ent.depth))
+                             field->graph_ent.depth);
+       if (trace_seq_has_overflowed(&iter->seq))
                return TRACE_TYPE_PARTIAL_LINE;
 
        return TRACE_TYPE_HANDLED;
@@ -899,8 +902,8 @@ static enum print_line_t trace_graph_ent_hex(struct trace_iterator *iter, int fl
 
        trace_assign_type(field, iter->ent);
 
-       SEQ_PUT_HEX_FIELD_RET(s, field->graph_ent.func);
-       SEQ_PUT_HEX_FIELD_RET(s, field->graph_ent.depth);
+       SEQ_PUT_HEX_FIELD(s, field->graph_ent.func);
+       SEQ_PUT_HEX_FIELD(s, field->graph_ent.depth);
 
        return TRACE_TYPE_HANDLED;
 }
@@ -913,8 +916,8 @@ static enum print_line_t trace_graph_ent_bin(struct trace_iterator *iter, int fl
 
        trace_assign_type(field, iter->ent);
 
-       SEQ_PUT_FIELD_RET(s, field->graph_ent.func);
-       SEQ_PUT_FIELD_RET(s, field->graph_ent.depth);
+       SEQ_PUT_FIELD(s, field->graph_ent.func);
+       SEQ_PUT_FIELD(s, field->graph_ent.depth);
 
        return TRACE_TYPE_HANDLED;
 }
@@ -941,13 +944,15 @@ static enum print_line_t trace_graph_ret_trace(struct trace_iterator *iter, int
 
        trace_assign_type(field, entry);
 
-       if (!trace_seq_puts(s, "graph_ret: func="))
+       trace_seq_puts(s, "graph_ret: func=");
+       if (trace_seq_has_overflowed(s))
                return TRACE_TYPE_PARTIAL_LINE;
 
        if (!seq_print_ip_sym(s, field->ret.func, flags))
                return TRACE_TYPE_PARTIAL_LINE;
 
-       if (!trace_seq_puts(s, "\n"))
+       trace_seq_puts(s, "\n");
+       if (trace_seq_has_overflowed(s))
                return TRACE_TYPE_PARTIAL_LINE;
 
        return TRACE_TYPE_HANDLED;
@@ -960,12 +965,13 @@ static enum print_line_t trace_graph_ret_raw(struct trace_iterator *iter, int fl
 
        trace_assign_type(field, iter->ent);
 
-       if (!trace_seq_printf(&iter->seq, "%lx %lld %lld %ld %d\n",
+       trace_seq_printf(&iter->seq, "%lx %lld %lld %ld %d\n",
                              field->ret.func,
                              field->ret.calltime,
                              field->ret.rettime,
                              field->ret.overrun,
-                             field->ret.depth));
+                             field->ret.depth);
+       if (trace_seq_has_overflowed(&iter->seq))
                return TRACE_TYPE_PARTIAL_LINE;
 
        return TRACE_TYPE_HANDLED;
@@ -979,11 +985,11 @@ static enum print_line_t trace_graph_ret_hex(struct trace_iterator *iter, int fl
 
        trace_assign_type(field, iter->ent);
 
-       SEQ_PUT_HEX_FIELD_RET(s, field->ret.func);
-       SEQ_PUT_HEX_FIELD_RET(s, field->ret.calltime);
-       SEQ_PUT_HEX_FIELD_RET(s, field->ret.rettime);
-       SEQ_PUT_HEX_FIELD_RET(s, field->ret.overrun);
-       SEQ_PUT_HEX_FIELD_RET(s, field->ret.depth);
+       SEQ_PUT_HEX_FIELD(s, field->ret.func);
+       SEQ_PUT_HEX_FIELD(s, field->ret.calltime);
+       SEQ_PUT_HEX_FIELD(s, field->ret.rettime);
+       SEQ_PUT_HEX_FIELD(s, field->ret.overrun);
+       SEQ_PUT_HEX_FIELD(s, field->ret.depth);
 
        return TRACE_TYPE_HANDLED;
 }
@@ -996,11 +1002,11 @@ static enum print_line_t trace_graph_ret_bin(struct trace_iterator *iter, int fl
 
        trace_assign_type(field, iter->ent);
 
-       SEQ_PUT_FIELD_RET(s, field->ret.func);
-       SEQ_PUT_FIELD_RET(s, field->ret.calltime);
-       SEQ_PUT_FIELD_RET(s, field->ret.rettime);
-       SEQ_PUT_FIELD_RET(s, field->ret.overrun);
-       SEQ_PUT_FIELD_RET(s, field->ret.depth);
+       SEQ_PUT_FIELD(s, field->ret.func);
+       SEQ_PUT_FIELD(s, field->ret.calltime);
+       SEQ_PUT_FIELD(s, field->ret.rettime);
+       SEQ_PUT_FIELD(s, field->ret.overrun);
+       SEQ_PUT_FIELD(s, field->ret.depth);
 
        return TRACE_TYPE_HANDLED;
 }