diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-06-13 23:56:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-13 23:56:52 -0700 |
| commit | 25c43bf13b1657d9a2f6a2565e9159ce31517aa5 (patch) | |
| tree | c1fef736d3227dbd3788206c746d00763247f232 /kernel | |
| parent | tcp: tcp_v6_connect() cleanup (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-25c43bf13b1657d9a2f6a2565e9159ce31517aa5.tar.xz linux-dev-25c43bf13b1657d9a2f6a2565e9159ce31517aa5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/fair.c | 2 | ||||
| -rw-r--r-- | kernel/trace/ring_buffer_benchmark.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index ffeaa4105e48..c2980e8733bc 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2181,7 +2181,7 @@ void task_numa_work(struct callback_head *work) } for (; vma; vma = vma->vm_next) { if (!vma_migratable(vma) || !vma_policy_mof(vma) || - is_vm_hugetlb_page(vma)) { + is_vm_hugetlb_page(vma) || (vma->vm_flags & VM_MIXEDMAP)) { continue; } 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 |