diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-08 14:42:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-08 14:42:49 -0700 |
| commit | b97fdef8e680ca8bdfea6114eea19fb6832d54be (patch) | |
| tree | 46e67832d876e16dd14cad66e9bf182c828dc794 /kernel | |
| parent | Copy the kernel module data from user space in chunks (diff) | |
| parent | mm: numa: disable change protection for vma(VM_HUGETLB) (diff) | |
| download | linux-dev-b97fdef8e680ca8bdfea6114eea19fb6832d54be.tar.xz linux-dev-b97fdef8e680ca8bdfea6114eea19fb6832d54be.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Three fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: numa: disable change protection for vma(VM_HUGETLB)
include/linux/dmapool.h: declare struct device
mm: move zone lock to a different cache line than order-0 free page lists
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/fair.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index bcfe32088b37..241213be507c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2165,8 +2165,10 @@ void task_numa_work(struct callback_head *work) vma = mm->mmap; } for (; vma; vma = vma->vm_next) { - if (!vma_migratable(vma) || !vma_policy_mof(vma)) + if (!vma_migratable(vma) || !vma_policy_mof(vma) || + is_vm_hugetlb_page(vma)) { continue; + } /* * Shared library pages mapped by multiple processes are not |