projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UPSTREAM: clk: rockchip: add clock-id for rk3036 emac pll source clock
[firefly-linux-kernel-4.4.55.git]
/
mm
/
page_isolation.c
diff --git
a/mm/page_isolation.c
b/mm/page_isolation.c
index 4568fd58f70a02c472e525528db58eeb20c06ebf..00c96462cc36cddb28f680f26cc7aeb4f6b2b04a 100644
(file)
--- a/
mm/page_isolation.c
+++ b/
mm/page_isolation.c
@@
-283,11
+283,11
@@
struct page *alloc_migrate_target(struct page *page, unsigned long private,
* now as a simple work-around, we use the next node for destination.
*/
if (PageHuge(page)) {
* now as a simple work-around, we use the next node for destination.
*/
if (PageHuge(page)) {
-
nodemask_t src = nodemask_of
_node(page_to_nid(page));
- nodemask_t dst;
-
nodes_complement(dst, src)
;
+
int node = next_online
_node(page_to_nid(page));
+ if (node == MAX_NUMNODES)
+
node = first_online_node
;
return alloc_huge_page_node(page_hstate(compound_head(page)),
return alloc_huge_page_node(page_hstate(compound_head(page)),
- n
ext_node(page_to_nid(page), dst)
);
+ n
ode
);
}
if (PageHighMem(page))
}
if (PageHighMem(page))