diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/hugetlb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index b4a263512cb7..450493d25572 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -1361,7 +1361,7 @@ static ssize_t nr_hugepages_store_common(bool obey_mempolicy, | |||
1361 | int nid; | 1361 | int nid; |
1362 | unsigned long count; | 1362 | unsigned long count; |
1363 | struct hstate *h; | 1363 | struct hstate *h; |
1364 | NODEMASK_ALLOC(nodemask_t, nodes_allowed); | 1364 | NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY); |
1365 | 1365 | ||
1366 | err = strict_strtoul(buf, 10, &count); | 1366 | err = strict_strtoul(buf, 10, &count); |
1367 | if (err) | 1367 | if (err) |
@@ -1857,7 +1857,8 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy, | |||
1857 | proc_doulongvec_minmax(table, write, buffer, length, ppos); | 1857 | proc_doulongvec_minmax(table, write, buffer, length, ppos); |
1858 | 1858 | ||
1859 | if (write) { | 1859 | if (write) { |
1860 | NODEMASK_ALLOC(nodemask_t, nodes_allowed); | 1860 | NODEMASK_ALLOC(nodemask_t, nodes_allowed, |
1861 | GFP_KERNEL | __GFP_NORETRY); | ||
1861 | if (!(obey_mempolicy && | 1862 | if (!(obey_mempolicy && |
1862 | init_nodemask_of_mempolicy(nodes_allowed))) { | 1863 | init_nodemask_of_mempolicy(nodes_allowed))) { |
1863 | NODEMASK_FREE(nodes_allowed); | 1864 | NODEMASK_FREE(nodes_allowed); |