History

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

Linus Torvalds committed 11 years ago

Commit b97fdef2 parents 3afe9f8 6b79c573 files · +8 −5Browse files

Unified · Split

3 files
  1. include/linux/dmapool.h +2 −0
  2. include/linux/mmzone.h +3 −4
  3. kernel/sched/fair.c +3 −1
include/linux/dmapool.h+2−0
@@ -14,6 +14,8 @@ · 13 unmodified lines
1414 #include <asm/io.h>
1515 #include <asm/scatterlist.h>
1616
17+struct device;
18+
1719 struct dma_pool *dma_pool_create(const char *name, struct device *dev,
1820 size_t size, size_t align, size_t allocation);
1921
include/linux/mmzone.h+3−4
@@ -474,16 +474,15 @@ struct zone { · 473 unmodified lines
474474 unsigned long wait_table_bits;
475475
476476 ZONE_PADDING(_pad1_)
477−
478− /* Write-intensive fields used from the page allocator */
479− spinlock_t lock;
480−
481477 /* free areas of different sizes */
482478 struct free_area free_area[MAX_ORDER];
483479
484480 /* zone flags, see below */
485481 unsigned long flags;
486482
483+ /* Write-intensive fields used from the page allocator */
484+ spinlock_t lock;
485+
487486 ZONE_PADDING(_pad2_)
488487
489488 /* Write-intensive fields used by page reclaim */
kernel/sched/fair.c+3−1
@@ -2165,8 +2165,10 @@ void task_numa_work(struct callback_head *work) · 2164 unmodified lines
21652165 vma = mm->mmap;
21662166 }
21672167 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)) {
21692170 continue;
2171+ }
21702172
21712173 /*
21722174 * Shared library pages mapped by multiple processes are not

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t