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

Commit 53b0a61a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/core' of... 

Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
parents c73a3cb3 436fc280

kernel/trace/trace.c

+4 −4
Original line number Diff line number Diff line
@@ -2720,9 +2720,9 @@ static const char readme_msg[] = 
	"# cat /sys/kernel/debug/tracing/trace_options\n"

	"noprint-parent nosym-offset nosym-addr noverbose\n"

	"# echo print-parent > /sys/kernel/debug/tracing/trace_options\n"

	"# echo 1 > /sys/kernel/debug/tracing/tracing_enabled\n"

	"# echo 1 > /sys/kernel/debug/tracing/tracing_on\n"

	"# cat /sys/kernel/debug/tracing/trace > /tmp/trace.txt\n"

	"# echo 0 > /sys/kernel/debug/tracing/tracing_enabled\n"

	"# echo 0 > /sys/kernel/debug/tracing/tracing_on\n"

;



static ssize_t
@@ -3903,8 +3903,6 @@ tracing_buffers_read(struct file *filp, char __user *ubuf, 
	if (info->read < PAGE_SIZE)

		goto read;



	info->read = 0;



	trace_access_lock(info->cpu);

	ret = ring_buffer_read_page(info->tr->buffer,

				    &info->spare,
@@ -3914,6 +3912,8 @@ tracing_buffers_read(struct file *filp, char __user *ubuf, 
	if (ret < 0)

		return 0;



	info->read = 0;



read:

	size = PAGE_SIZE - info->read;

	if (size > count)