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

Commit 4a66a82b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'tracing/blktrace', 'tracing/kmemtrace' and 'tracing/urgent' into tracing/core

parents 32c0bd96 cc2f6d90 ba2607fe

kernel/trace/kmemtrace.c

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



	/* Requested */

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

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

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;



	/* Allocated */

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

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

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;

kernel/trace/ring_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static inline int test_time_stamp(u64 delta) 
	return 0;

}



#define BUF_PAGE_SIZE (PAGE_SIZE - sizeof(struct buffer_data_page))

#define BUF_PAGE_SIZE (PAGE_SIZE - offsetof(struct buffer_data_page, data))



/*

 * head_page == tail_page && head == tail then buffer is empty.