projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'configfs-for-4.8' of git://git.infradead.org/users/hch/configfs
[deliverable/linux.git]
/
mm
/
mempolicy.c
diff --git
a/mm/mempolicy.c
b/mm/mempolicy.c
index 297d6854f84920f4420d5929fd3bc1084dd8a15e..d8c4e38fb5f4be1d9748dc77f214c8a285374f8d 100644
(file)
--- a/
mm/mempolicy.c
+++ b/
mm/mempolicy.c
@@
-512,6
+512,8
@@
static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr,
}
}
}
}
+ if (pmd_trans_unstable(pmd))
+ return 0;
retry:
pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl);
for (; addr != end; pte++, addr += PAGE_SIZE) {
retry:
pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl);
for (; addr != end; pte++, addr += PAGE_SIZE) {
@@
-529,7
+531,7
@@
retry:
nid = page_to_nid(page);
if (node_isset(nid, *qp->nmask) == !!(flags & MPOL_MF_INVERT))
continue;
nid = page_to_nid(page);
if (node_isset(nid, *qp->nmask) == !!(flags & MPOL_MF_INVERT))
continue;
- if (PageTransCompound(page)
&& PageAnon(page)
) {
+ if (PageTransCompound(page)) {
get_page(page);
pte_unmap_unlock(pte, ptl);
lock_page(page);
get_page(page);
pte_unmap_unlock(pte, ptl);
lock_page(page);
@@
-960,7
+962,7
@@
static void migrate_page_add(struct page *page, struct list_head *pagelist,
if ((flags & MPOL_MF_MOVE_ALL) || page_mapcount(page) == 1) {
if (!isolate_lru_page(page)) {
list_add_tail(&page->lru, pagelist);
if ((flags & MPOL_MF_MOVE_ALL) || page_mapcount(page) == 1) {
if (!isolate_lru_page(page)) {
list_add_tail(&page->lru, pagelist);
- inc_
zon
e_page_state(page, NR_ISOLATED_ANON +
+ inc_
nod
e_page_state(page, NR_ISOLATED_ANON +
page_is_file_cache(page));
}
}
page_is_file_cache(page));
}
}
This page took
0.024448 seconds
and
5
git commands to generate.