projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio
[cascardo/linux.git]
/
mm
/
mempolicy.c
diff --git
a/mm/mempolicy.c
b/mm/mempolicy.c
index
0cd2c4d
..
463b7fb
100644
(file)
--- a/
mm/mempolicy.c
+++ b/
mm/mempolicy.c
@@
-1199,10
+1199,8
@@
static struct page *new_vma_page(struct page *page, unsigned long private, int *
}
if (PageHuge(page)) {
}
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
}
/*
* if !vma, alloc_page_vma() will use task or system default policy
@@
-2668,7
+2666,7
@@
static void __init check_numabalancing_enable(void)
if (nr_node_ids > 1 && !numabalancing_override) {
printk(KERN_INFO "Enabling automatic NUMA balancing. "
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);
}
}
set_numabalancing_state(numabalancing_default);
}
}