Merge branch 'akpm-current/current'

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

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 431fd768fbf3ebda3c0ba4bd5e87158ee939c804..36cb46cddf61aacc1b47f3d925ad58cc7a9926bb 100644 (file)
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1198,10 +1198,8 @@ static struct page *new_vma_page(struct page *page, unsigned long private, int *
        }
 
        if (PageHuge(page)) {
-               if (vma)
-                       return alloc_huge_page_noerr(vma, address, 1);
-               else
-                       return NULL;
+               BUG_ON(!vma);
+               return alloc_huge_page_noerr(vma, address, 1);
        }
        /*
         * if !vma, alloc_page_vma() will use task or system default policy
@@ -2667,7 +2665,7 @@ static void __init check_numabalancing_enable(void)
 
        if (nr_node_ids > 1 && !numabalancing_override) {
                printk(KERN_INFO "Enabling automatic NUMA balancing. "
-                       "Configure with numa_balancing= or sysctl");
+                       "Configure with numa_balancing= or the kernel.numa_balancing sysctl");
                set_numabalancing_state(numabalancing_default);
        }
 }