Commit cff100f5 authored Jun 11, 2015 by Linus Torvalds

Merge tag 'trace-rb-bm-fix-4.1-rc7' of...

Merge tag 'trace-rb-bm-fix-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull ring buffer benchmark buglet fix from Steven Rostedt:
 "Wang Long fixed a minor bug in the module parameter for the ring
  buffer benchmark, where the produce_fifo was being ignored and the
  producer thread's priority was being set with the consumer_fifo
  parameter"

* tag 'trace-rb-bm-fix-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ring-buffer-benchmark: Fix the wrong sched_priority of producer

parents 2bfc60dd 10802932

kernel/trace/ring_buffer_benchmark.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -450,7 +450,7 @@ static int __init ring_buffer_benchmark_init(void)

	if (producer_fifo >= 0) {		if (producer_fifo >= 0) {
	struct sched_param param = {		struct sched_param param = {
	.sched_priority = consumer_fifo		.sched_priority = producer_fifo
	};		};
	sched_setscheduler(producer, SCHED_FIFO, &param);		sched_setscheduler(producer, SCHED_FIFO, &param);
	} else		} else