Home Home > GIT Browse > SLE11-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-06-12 15:54:23 +0200
committerJiri Kosina <jkosina@suse.cz>2018-06-12 15:54:23 +0200
commit943535c528dc2f7409b77691de07a07623081b8a (patch)
treed71d78c294024ba1162c63444e938a307a8a0db8
parent7664f5bbdf53f776eb2c3d3d7fe143892c084ca8 (diff)
parenta782350e9782d163455c1b68ed49ef4177526507 (diff)
Merge remote-tracking branch 'origin/users/vbabka/SLE11-SP4/for-next' into SLE11-SP4
Pull mm numa fix from Vlastimil Babka suse-commit: 5f9ac2a2eb217f5191d16c819d639efa66bd459c
-rw-r--r--mm/page_alloc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2995ffb7bea0..c1297ceae9b1 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2275,8 +2275,6 @@ rebalance:
* the allocation is high priority and these type of
* allocations are system rather than user orientated
*/
- zonelist = node_zonelist(numa_node_id(), gfp_mask);
-
page = __alloc_pages_high_priority(gfp_mask, order,
zonelist, high_zoneidx, nodemask,
preferred_zone, migratetype);