diff options
Diffstat (limited to 'kernel/trace/trace_output.c')
| -rw-r--r-- | kernel/trace/trace_output.c | 21 | 
1 files changed, 6 insertions, 15 deletions
| diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index bac629af2285..c738e764e2a5 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -656,15 +656,6 @@ int trace_print_lat_context(struct trace_iterator *iter)  	return !trace_seq_has_overflowed(s);  } -static const char state_to_char[] = TASK_STATE_TO_CHAR_STR; - -static int task_state_char(unsigned long state) -{ -	int bit = state ? __ffs(state) + 1 : 0; - -	return bit < sizeof(state_to_char) - 1 ? state_to_char[bit] : '?'; -} -  /**   * ftrace_find_event - find a registered event   * @type: the type of event to look for @@ -930,8 +921,8 @@ static enum print_line_t trace_ctxwake_print(struct trace_iterator *iter,  	trace_assign_type(field, iter->ent); -	T = task_state_char(field->next_state); -	S = task_state_char(field->prev_state); +	T = __task_state_to_char(field->next_state); +	S = __task_state_to_char(field->prev_state);  	trace_find_cmdline(field->next_pid, comm);  	trace_seq_printf(&iter->seq,  			 " %5d:%3d:%c %s [%03d] %5d:%3d:%c %s\n", @@ -966,8 +957,8 @@ static int trace_ctxwake_raw(struct trace_iterator *iter, char S)  	trace_assign_type(field, iter->ent);  	if (!S) -		S = task_state_char(field->prev_state); -	T = task_state_char(field->next_state); +		S = __task_state_to_char(field->prev_state); +	T = __task_state_to_char(field->next_state);  	trace_seq_printf(&iter->seq, "%d %d %c %d %d %d %c\n",  			 field->prev_pid,  			 field->prev_prio, @@ -1002,8 +993,8 @@ static int trace_ctxwake_hex(struct trace_iterator *iter, char S)  	trace_assign_type(field, iter->ent);  	if (!S) -		S = task_state_char(field->prev_state); -	T = task_state_char(field->next_state); +		S = __task_state_to_char(field->prev_state); +	T = __task_state_to_char(field->next_state);  	SEQ_PUT_HEX_FIELD(s, field->prev_pid);  	SEQ_PUT_HEX_FIELD(s, field->prev_prio); |