diff options
-rw-r--r-- | mm/hugetlb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ce8e5bb6f031..bb0b7c128015 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -1375,10 +1375,8 @@ static ssize_t nr_hugepages_store_common(bool obey_mempolicy, | |||
1375 | NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY); | 1375 | NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY); |
1376 | 1376 | ||
1377 | err = strict_strtoul(buf, 10, &count); | 1377 | err = strict_strtoul(buf, 10, &count); |
1378 | if (err) { | 1378 | if (err) |
1379 | err = 0; /* This seems wrong */ | ||
1380 | goto out; | 1379 | goto out; |
1381 | } | ||
1382 | 1380 | ||
1383 | h = kobj_to_hstate(kobj, &nid); | 1381 | h = kobj_to_hstate(kobj, &nid); |
1384 | if (h->order >= MAX_ORDER) { | 1382 | if (h->order >= MAX_ORDER) { |
@@ -1469,7 +1467,7 @@ static ssize_t nr_overcommit_hugepages_store(struct kobject *kobj, | |||
1469 | 1467 | ||
1470 | err = strict_strtoul(buf, 10, &input); | 1468 | err = strict_strtoul(buf, 10, &input); |
1471 | if (err) | 1469 | if (err) |
1472 | return 0; | 1470 | return err; |
1473 | 1471 | ||
1474 | spin_lock(&hugetlb_lock); | 1472 | spin_lock(&hugetlb_lock); |
1475 | h->nr_overcommit_huge_pages = input; | 1473 | h->nr_overcommit_huge_pages = input; |