diff options
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 54 | 
1 files changed, 27 insertions, 27 deletions
| diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 8388bc99f2e..b5c09242683 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -446,7 +446,7 @@ print_graph_proc(struct trace_seq *s, pid_t pid)  	/* First spaces to align center */  	for (i = 0; i < spaces / 2; i++) { -		ret = trace_seq_printf(s, " "); +		ret = trace_seq_putc(s, ' ');  		if (!ret)  			return TRACE_TYPE_PARTIAL_LINE;  	} @@ -457,7 +457,7 @@ print_graph_proc(struct trace_seq *s, pid_t pid)  	/* Last spaces to align center */  	for (i = 0; i < spaces - (spaces / 2); i++) { -		ret = trace_seq_printf(s, " "); +		ret = trace_seq_putc(s, ' ');  		if (!ret)  			return TRACE_TYPE_PARTIAL_LINE;  	} @@ -503,7 +503,7 @@ verif_pid(struct trace_seq *s, pid_t pid, int cpu, struct fgraph_data *data)   ------------------------------------------   */ -	ret = trace_seq_printf(s, +	ret = trace_seq_puts(s,  		" ------------------------------------------\n");  	if (!ret)  		return TRACE_TYPE_PARTIAL_LINE; @@ -516,7 +516,7 @@ verif_pid(struct trace_seq *s, pid_t pid, int cpu, struct fgraph_data *data)  	if (ret == TRACE_TYPE_PARTIAL_LINE)  		return TRACE_TYPE_PARTIAL_LINE; -	ret = trace_seq_printf(s, " => "); +	ret = trace_seq_puts(s, " => ");  	if (!ret)  		return TRACE_TYPE_PARTIAL_LINE; @@ -524,7 +524,7 @@ verif_pid(struct trace_seq *s, pid_t pid, int cpu, struct fgraph_data *data)  	if (ret == TRACE_TYPE_PARTIAL_LINE)  		return TRACE_TYPE_PARTIAL_LINE; -	ret = trace_seq_printf(s, +	ret = trace_seq_puts(s,  		"\n ------------------------------------------\n\n");  	if (!ret)  		return TRACE_TYPE_PARTIAL_LINE; @@ -645,7 +645,7 @@ print_graph_irq(struct trace_iterator *iter, unsigned long addr,  			ret = print_graph_proc(s, pid);  			if (ret == TRACE_TYPE_PARTIAL_LINE)  				return TRACE_TYPE_PARTIAL_LINE; -			ret = trace_seq_printf(s, " | "); +			ret = trace_seq_puts(s, " | ");  			if (!ret)  				return TRACE_TYPE_PARTIAL_LINE;  		} @@ -657,9 +657,9 @@ print_graph_irq(struct trace_iterator *iter, unsigned long addr,  		return ret;  	if (type == TRACE_GRAPH_ENT) -		ret = trace_seq_printf(s, "==========>"); +		ret = trace_seq_puts(s, "==========>");  	else -		ret = trace_seq_printf(s, "<=========="); +		ret = trace_seq_puts(s, "<==========");  	if (!ret)  		return TRACE_TYPE_PARTIAL_LINE; @@ -668,7 +668,7 @@ print_graph_irq(struct trace_iterator *iter, unsigned long addr,  	if (ret != TRACE_TYPE_HANDLED)  		return ret; -	ret = trace_seq_printf(s, "\n"); +	ret = trace_seq_putc(s, '\n');  	if (!ret)  		return TRACE_TYPE_PARTIAL_LINE; @@ -705,13 +705,13 @@ trace_print_graph_duration(unsigned long long duration, struct trace_seq *s)  		len += strlen(nsecs_str);  	} -	ret = trace_seq_printf(s, " us "); +	ret = trace_seq_puts(s, " us ");  	if (!ret)  		return TRACE_TYPE_PARTIAL_LINE;  	/* Print remaining spaces to fit the row's width */  	for (i = len; i < 7; i++) { -		ret = trace_seq_printf(s, " "); +		ret = trace_seq_putc(s, ' ');  		if (!ret)  			return TRACE_TYPE_PARTIAL_LINE;  	} @@ -731,13 +731,13 @@ print_graph_duration(unsigned long long duration, struct trace_seq *s,  	/* No real adata, just filling the column with spaces */  	switch (duration) {  	case DURATION_FILL_FULL: -		ret = trace_seq_printf(s, "              |  "); +		ret = trace_seq_puts(s, "              |  ");  		return ret ? TRACE_TYPE_HANDLED : TRACE_TYPE_PARTIAL_LINE;  	case DURATION_FILL_START: -		ret = trace_seq_printf(s, "  "); +		ret = trace_seq_puts(s, "  ");  		return ret ? TRACE_TYPE_HANDLED : TRACE_TYPE_PARTIAL_LINE;  	case DURATION_FILL_END: -		ret = trace_seq_printf(s, " |"); +		ret = trace_seq_puts(s, " |");  		return ret ? TRACE_TYPE_HANDLED : TRACE_TYPE_PARTIAL_LINE;  	} @@ -745,10 +745,10 @@ print_graph_duration(unsigned long long duration, struct trace_seq *s,  	if (flags & TRACE_GRAPH_PRINT_OVERHEAD) {  		/* Duration exceeded 100 msecs */  		if (duration > 100000ULL) -			ret = trace_seq_printf(s, "! "); +			ret = trace_seq_puts(s, "! ");  		/* Duration exceeded 10 msecs */  		else if (duration > 10000ULL) -			ret = trace_seq_printf(s, "+ "); +			ret = trace_seq_puts(s, "+ ");  	}  	/* @@ -757,7 +757,7 @@ print_graph_duration(unsigned long long duration, struct trace_seq *s,  	 * to fill out the space.  	 */  	if (ret == -1) -		ret = trace_seq_printf(s, "  "); +		ret = trace_seq_puts(s, "  ");  	/* Catching here any failure happenned above */  	if (!ret) @@ -767,7 +767,7 @@ print_graph_duration(unsigned long long duration, struct trace_seq *s,  	if (ret != TRACE_TYPE_HANDLED)  		return ret; -	ret = trace_seq_printf(s, "|  "); +	ret = trace_seq_puts(s, "|  ");  	if (!ret)  		return TRACE_TYPE_PARTIAL_LINE; @@ -817,7 +817,7 @@ print_graph_entry_leaf(struct trace_iterator *iter,  	/* Function */  	for (i = 0; i < call->depth * TRACE_GRAPH_INDENT; i++) { -		ret = trace_seq_printf(s, " "); +		ret = trace_seq_putc(s, ' ');  		if (!ret)  			return TRACE_TYPE_PARTIAL_LINE;  	} @@ -858,7 +858,7 @@ print_graph_entry_nested(struct trace_iterator *iter,  	/* Function */  	for (i = 0; i < call->depth * TRACE_GRAPH_INDENT; i++) { -		ret = trace_seq_printf(s, " "); +		ret = trace_seq_putc(s, ' ');  		if (!ret)  			return TRACE_TYPE_PARTIAL_LINE;  	} @@ -917,7 +917,7 @@ print_graph_prologue(struct trace_iterator *iter, struct trace_seq *s,  		if (ret == TRACE_TYPE_PARTIAL_LINE)  			return TRACE_TYPE_PARTIAL_LINE; -		ret = trace_seq_printf(s, " | "); +		ret = trace_seq_puts(s, " | ");  		if (!ret)  			return TRACE_TYPE_PARTIAL_LINE;  	} @@ -1117,7 +1117,7 @@ print_graph_return(struct ftrace_graph_ret *trace, struct trace_seq *s,  	/* Closing brace */  	for (i = 0; i < trace->depth * TRACE_GRAPH_INDENT; i++) { -		ret = trace_seq_printf(s, " "); +		ret = trace_seq_putc(s, ' ');  		if (!ret)  			return TRACE_TYPE_PARTIAL_LINE;  	} @@ -1129,7 +1129,7 @@ print_graph_return(struct ftrace_graph_ret *trace, struct trace_seq *s,  	 * belongs to, write out the function name.  	 */  	if (func_match) { -		ret = trace_seq_printf(s, "}\n"); +		ret = trace_seq_puts(s, "}\n");  		if (!ret)  			return TRACE_TYPE_PARTIAL_LINE;  	} else { @@ -1179,13 +1179,13 @@ print_graph_comment(struct trace_seq *s, struct trace_entry *ent,  	/* Indentation */  	if (depth > 0)  		for (i = 0; i < (depth + 1) * TRACE_GRAPH_INDENT; i++) { -			ret = trace_seq_printf(s, " "); +			ret = trace_seq_putc(s, ' ');  			if (!ret)  				return TRACE_TYPE_PARTIAL_LINE;  		}  	/* The comment */ -	ret = trace_seq_printf(s, "/* "); +	ret = trace_seq_puts(s, "/* ");  	if (!ret)  		return TRACE_TYPE_PARTIAL_LINE; @@ -1216,7 +1216,7 @@ print_graph_comment(struct trace_seq *s, struct trace_entry *ent,  		s->len--;  	} -	ret = trace_seq_printf(s, " */\n"); +	ret = trace_seq_puts(s, " */\n");  	if (!ret)  		return TRACE_TYPE_PARTIAL_LINE; @@ -1448,7 +1448,7 @@ static struct trace_event graph_trace_ret_event = {  	.funcs		= &graph_functions  }; -static struct tracer graph_trace __read_mostly = { +static struct tracer graph_trace __tracer_data = {  	.name		= "function_graph",  	.open		= graph_trace_open,  	.pipe_open	= graph_trace_open, | 
