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
Unified · Split
| @@ -14,6 +14,8 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <asm/io.h> |
| 15 | 15 | #include <asm/scatterlist.h> |
| 16 | 16 | |
| 17 | +struct device; | |
| 18 | + | |
| 17 | 19 | struct dma_pool *dma_pool_create(const char *name, struct device *dev, |
| 18 | 20 | size_t size, size_t align, size_t allocation); |
| 19 | 21 | |
| @@ -474,16 +474,15 @@ struct zone { · 473 unmodified lines | ||
| 474 | 474 | unsigned long wait_table_bits; |
| 475 | 475 | |
| 476 | 476 | ZONE_PADDING(_pad1_) |
| 477 | − | |
| 478 | − /* Write-intensive fields used from the page allocator */ | |
| 479 | − spinlock_t lock; | |
| 480 | − | |
| 481 | 477 | /* free areas of different sizes */ |
| 482 | 478 | struct free_area free_area[MAX_ORDER]; |
| 483 | 479 | |
| 484 | 480 | /* zone flags, see below */ |
| 485 | 481 | unsigned long flags; |
| 486 | 482 | |
| 483 | + /* Write-intensive fields used from the page allocator */ | |
| 484 | + spinlock_t lock; | |
| 485 | + | |
| 487 | 486 | ZONE_PADDING(_pad2_) |
| 488 | 487 | |
| 489 | 488 | /* Write-intensive fields used by page reclaim */ |
| @@ -2165,8 +2165,10 @@ void task_numa_work(struct callback_head *work) · 2164 unmodified lines | ||
| 2165 | 2165 | vma = mm->mmap; |
| 2166 | 2166 | } |
| 2167 | 2167 | for (; vma; vma = vma->vm_next) { |
| 2168 | − if (!vma_migratable(vma) || !vma_policy_mof(vma)) | |
| 2168 | + if (!vma_migratable(vma) || !vma_policy_mof(vma) || | |
| 2169 | + is_vm_hugetlb_page(vma)) { | |
| 2169 | 2170 | continue; |
| 2171 | + } | |
| 2170 | 2172 | |
| 2171 | 2173 | /* |
| 2172 | 2174 | * Shared library pages mapped by multiple processes are not |