Merge tag 'wireless-drivers-for-davem-2015-05-25' of git://git.kernel.org/pub/scm...

[karo-tx-linux.git] / mm / mempolicy.c

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 4721046a134a6b8c6ab177c92cebbc67da02dc9d..747743237d9f4d3ead6117d4ee152c00659cd362 100644 (file)
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -945,7 +945,8 @@ static struct page *new_node_page(struct page *page, unsigned long node, int **x
                return alloc_huge_page_node(page_hstate(compound_head(page)),
                                        node);
        else
-               return alloc_pages_exact_node(node, GFP_HIGHUSER_MOVABLE, 0);
+               return alloc_pages_exact_node(node, GFP_HIGHUSER_MOVABLE |
+                                                   __GFP_THISNODE, 0);
 }
 
 /*
@@ -1985,7 +1986,8 @@ retry_cpuset:
                nmask = policy_nodemask(gfp, pol);
                if (!nmask || node_isset(node, *nmask)) {
                        mpol_cond_put(pol);
-                       page = alloc_pages_exact_node(node, gfp, order);
+                       page = alloc_pages_exact_node(node,
+                                               gfp | __GFP_THISNODE, order);
                        goto out;
                }
        }
@@ -2516,7 +2518,7 @@ static void __init check_numabalancing_enable(void)
        if (numabalancing_override)
                set_numabalancing_state(numabalancing_override == 1);
 
-       if (nr_node_ids > 1 && !numabalancing_override) {
+       if (num_online_nodes() > 1 && !numabalancing_override) {
                pr_info("%s automatic NUMA balancing. "
                        "Configure with numa_balancing= or the "
                        "kernel.numa_balancing sysctl",