Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e4abc98 authored by Steven Rostedt's avatar Steven Rostedt Committed by Ingo Molnar
Browse files

trace: clean up format errors in calls to trace_seq_printf 



After adding the printf format checking for trace_seq_printf, several
warnings now show up. This patch cleans them up.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c37abc55

kernel/trace/kmemtrace.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -139,12 +139,12 @@ kmemtrace_print_alloc_compress(struct trace_iterator *iter, 
		return TRACE_TYPE_PARTIAL_LINE;

		return TRACE_TYPE_PARTIAL_LINE;





	/* Requested */

	/* Requested */

	ret = trace_seq_printf(s, "%4d   ", entry->bytes_req);

	ret = trace_seq_printf(s, "%4ld   ", entry->bytes_req);

	if (!ret)

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;

		return TRACE_TYPE_PARTIAL_LINE;





	/* Allocated */

	/* Allocated */

	ret = trace_seq_printf(s, "%4d   ", entry->bytes_alloc);

	ret = trace_seq_printf(s, "%4ld   ", entry->bytes_alloc);

	if (!ret)

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;

		return TRACE_TYPE_PARTIAL_LINE;

kernel/trace/trace_mmiotrace.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -184,21 +184,22 @@ static enum print_line_t mmio_print_rw(struct trace_iterator *iter) 
	switch (rw->opcode) {

	switch (rw->opcode) {

	case MMIO_READ:

	case MMIO_READ:

		ret = trace_seq_printf(s,

		ret = trace_seq_printf(s,

			"R %d %lu.%06lu %d 0x%llx 0x%lx 0x%lx %d\n",

			"R %d %u.%06lu %d 0x%llx 0x%lx 0x%lx %d\n",

			rw->width, secs, usec_rem, rw->map_id,

			rw->width, secs, usec_rem, rw->map_id,

			(unsigned long long)rw->phys,

			(unsigned long long)rw->phys,

			rw->value, rw->pc, 0);

			rw->value, rw->pc, 0);

		break;

		break;

	case MMIO_WRITE:

	case MMIO_WRITE:

		ret = trace_seq_printf(s,

		ret = trace_seq_printf(s,

			"W %d %lu.%06lu %d 0x%llx 0x%lx 0x%lx %d\n",

			"W %d %u.%06lu %d 0x%llx 0x%lx 0x%lx %d\n",

			rw->width, secs, usec_rem, rw->map_id,

			rw->width, secs, usec_rem, rw->map_id,

			(unsigned long long)rw->phys,

			(unsigned long long)rw->phys,

			rw->value, rw->pc, 0);

			rw->value, rw->pc, 0);

		break;

		break;

	case MMIO_UNKNOWN_OP:

	case MMIO_UNKNOWN_OP:

		ret = trace_seq_printf(s,

		ret = trace_seq_printf(s,

			"UNKNOWN %lu.%06lu %d 0x%llx %02x,%02x,%02x 0x%lx %d\n",

			"UNKNOWN %u.%06lu %d 0x%llx %02lx,%02lx,"

			"%02lx 0x%lx %d\n",

			secs, usec_rem, rw->map_id,

			secs, usec_rem, rw->map_id,

			(unsigned long long)rw->phys,

			(unsigned long long)rw->phys,

			(rw->value >> 16) & 0xff, (rw->value >> 8) & 0xff,

			(rw->value >> 16) & 0xff, (rw->value >> 8) & 0xff,
@@ -230,14 +231,14 @@ static enum print_line_t mmio_print_map(struct trace_iterator *iter) 
	switch (m->opcode) {

	switch (m->opcode) {

	case MMIO_PROBE:

	case MMIO_PROBE:

		ret = trace_seq_printf(s,

		ret = trace_seq_printf(s,

			"MAP %lu.%06lu %d 0x%llx 0x%lx 0x%lx 0x%lx %d\n",

			"MAP %u.%06lu %d 0x%llx 0x%lx 0x%lx 0x%lx %d\n",

			secs, usec_rem, m->map_id,

			secs, usec_rem, m->map_id,

			(unsigned long long)m->phys, m->virt, m->len,

			(unsigned long long)m->phys, m->virt, m->len,

			0UL, 0);

			0UL, 0);

		break;

		break;

	case MMIO_UNPROBE:

	case MMIO_UNPROBE:

		ret = trace_seq_printf(s,

		ret = trace_seq_printf(s,

			"UNMAP %lu.%06lu %d 0x%lx %d\n",

			"UNMAP %u.%06lu %d 0x%lx %d\n",

			secs, usec_rem, m->map_id, 0UL, 0);

			secs, usec_rem, m->map_id, 0UL, 0);

		break;

		break;

	default:

	default:
@@ -261,7 +262,7 @@ static enum print_line_t mmio_print_mark(struct trace_iterator *iter) 
	int ret;

	int ret;





	/* The trailing newline must be in the message. */

	/* The trailing newline must be in the message. */

	ret = trace_seq_printf(s, "MARK %lu.%06lu %s", secs, usec_rem, msg);

	ret = trace_seq_printf(s, "MARK %u.%06lu %s", secs, usec_rem, msg);

	if (!ret)

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;

		return TRACE_TYPE_PARTIAL_LINE;

kernel/trace/trace_output.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -440,7 +440,7 @@ trace_fn_raw(struct trace_seq *s, struct trace_entry *entry, int flags) 




	trace_assign_type(field, entry);

	trace_assign_type(field, entry);





	if (!trace_seq_printf(s, "%x %x\n",

	if (!trace_seq_printf(s, "%lx %lx\n",

			      field->ip,

			      field->ip,

			      field->parent_ip))

			      field->parent_ip))

		return TRACE_TYPE_PARTIAL_LINE;

		return TRACE_TYPE_PARTIAL_LINE;