diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-11 14:00:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-11 14:00:10 -0700 |
| commit | cff100f5d746465ca40e61cf296321ecf07d3f1c (patch) | |
| tree | d26367fab57fbcc58ada80cdb6a0cd9c84b26d5c | |
| parent | 2bfc60dd2869745f5bbed9583c517cc76e3db924 (diff) | |
| parent | 108029323910c5dd1ef8fa2d10da1ce5fbce6e12 (diff) | |
| download | linux-cff100f5d746465ca40e61cf296321ecf07d3f1c.tar.bz2 | |
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
| -rw-r--r-- | kernel/trace/ring_buffer_benchmark.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer_benchmark.c b/kernel/trace/ring_buffer_benchmark.c index 13d945c0d03f..1b28df2d9104 100644 --- a/kernel/trace/ring_buffer_benchmark.c +++ b/kernel/trace/ring_buffer_benchmark.c @@ -450,7 +450,7 @@ static int __init ring_buffer_benchmark_init(void) if (producer_fifo >= 0) { struct sched_param param = { - .sched_priority = consumer_fifo + .sched_priority = producer_fifo }; sched_setscheduler(producer, SCHED_FIFO, ¶m); } else |