ftrace: include cpu in stacktrace (f29c73fe) · Commits · e / devices / android_kernel_samsung_universal8895

kernel/trace/trace.c

+11 −15

Original line number	Original line	Diff line number	Diff line
	@@ -1227,11 +1227,9 @@ print_lat_fmt(struct trace_iterator *iter, unsigned int trace_idx, int cpu)
	abs_usecs % 1000, rel_usecs/1000,		abs_usecs % 1000, rel_usecs/1000,
	rel_usecs % 1000);		rel_usecs % 1000);
	} else {		} else {
	if (entry->type != TRACE_STACK) {
	lat_print_generic(s, entry, cpu);		lat_print_generic(s, entry, cpu);
	lat_print_timestamp(s, abs_usecs, rel_usecs);		lat_print_timestamp(s, abs_usecs, rel_usecs);
	}		}
	}
	switch (entry->type) {		switch (entry->type) {
	case TRACE_FN:		case TRACE_FN:
	seq_print_ip_sym(s, entry->fn.ip, sym_flags);		seq_print_ip_sym(s, entry->fn.ip, sym_flags);
	@@ -1293,7 +1291,6 @@ static int print_trace_fmt(struct trace_iterator *iter)
	usec_rem = do_div(t, 1000000ULL);		usec_rem = do_div(t, 1000000ULL);
	secs = (unsigned long)t;		secs = (unsigned long)t;

	if (entry->type != TRACE_STACK) {
	ret = trace_seq_printf(s, "%16s-%-5d ", comm, entry->pid);		ret = trace_seq_printf(s, "%16s-%-5d ", comm, entry->pid);
	if (!ret)		if (!ret)
	return 0;		return 0;
	@@ -1303,7 +1300,6 @@ static int print_trace_fmt(struct trace_iterator *iter)
	ret = trace_seq_printf(s, "%5lu.%06lu: ", secs, usec_rem);		ret = trace_seq_printf(s, "%5lu.%06lu: ", secs, usec_rem);
	if (!ret)		if (!ret)
	return 0;		return 0;
	}

	switch (entry->type) {		switch (entry->type) {
	case TRACE_FN:		case TRACE_FN: