diff options
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r-- | mm/hugetlb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 815dbd4a6dcb..6f048fcc749c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -1537,7 +1537,7 @@ static unsigned int cpuset_mems_nr(unsigned int *array) | |||
1537 | 1537 | ||
1538 | #ifdef CONFIG_SYSCTL | 1538 | #ifdef CONFIG_SYSCTL |
1539 | int hugetlb_sysctl_handler(struct ctl_table *table, int write, | 1539 | int hugetlb_sysctl_handler(struct ctl_table *table, int write, |
1540 | struct file *file, void __user *buffer, | 1540 | void __user *buffer, |
1541 | size_t *length, loff_t *ppos) | 1541 | size_t *length, loff_t *ppos) |
1542 | { | 1542 | { |
1543 | struct hstate *h = &default_hstate; | 1543 | struct hstate *h = &default_hstate; |
@@ -1548,7 +1548,7 @@ int hugetlb_sysctl_handler(struct ctl_table *table, int write, | |||
1548 | 1548 | ||
1549 | table->data = &tmp; | 1549 | table->data = &tmp; |
1550 | table->maxlen = sizeof(unsigned long); | 1550 | table->maxlen = sizeof(unsigned long); |
1551 | proc_doulongvec_minmax(table, write, file, buffer, length, ppos); | 1551 | proc_doulongvec_minmax(table, write, buffer, length, ppos); |
1552 | 1552 | ||
1553 | if (write) | 1553 | if (write) |
1554 | h->max_huge_pages = set_max_huge_pages(h, tmp); | 1554 | h->max_huge_pages = set_max_huge_pages(h, tmp); |
@@ -1557,10 +1557,10 @@ int hugetlb_sysctl_handler(struct ctl_table *table, int write, | |||
1557 | } | 1557 | } |
1558 | 1558 | ||
1559 | int hugetlb_treat_movable_handler(struct ctl_table *table, int write, | 1559 | int hugetlb_treat_movable_handler(struct ctl_table *table, int write, |
1560 | struct file *file, void __user *buffer, | 1560 | void __user *buffer, |
1561 | size_t *length, loff_t *ppos) | 1561 | size_t *length, loff_t *ppos) |
1562 | { | 1562 | { |
1563 | proc_dointvec(table, write, file, buffer, length, ppos); | 1563 | proc_dointvec(table, write, buffer, length, ppos); |
1564 | if (hugepages_treat_as_movable) | 1564 | if (hugepages_treat_as_movable) |
1565 | htlb_alloc_mask = GFP_HIGHUSER_MOVABLE; | 1565 | htlb_alloc_mask = GFP_HIGHUSER_MOVABLE; |
1566 | else | 1566 | else |
@@ -1569,7 +1569,7 @@ int hugetlb_treat_movable_handler(struct ctl_table *table, int write, | |||
1569 | } | 1569 | } |
1570 | 1570 | ||
1571 | int hugetlb_overcommit_handler(struct ctl_table *table, int write, | 1571 | int hugetlb_overcommit_handler(struct ctl_table *table, int write, |
1572 | struct file *file, void __user *buffer, | 1572 | void __user *buffer, |
1573 | size_t *length, loff_t *ppos) | 1573 | size_t *length, loff_t *ppos) |
1574 | { | 1574 | { |
1575 | struct hstate *h = &default_hstate; | 1575 | struct hstate *h = &default_hstate; |
@@ -1580,7 +1580,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write, | |||
1580 | 1580 | ||
1581 | table->data = &tmp; | 1581 | table->data = &tmp; |
1582 | table->maxlen = sizeof(unsigned long); | 1582 | table->maxlen = sizeof(unsigned long); |
1583 | proc_doulongvec_minmax(table, write, file, buffer, length, ppos); | 1583 | proc_doulongvec_minmax(table, write, buffer, length, ppos); |
1584 | 1584 | ||
1585 | if (write) { | 1585 | if (write) { |
1586 | spin_lock(&hugetlb_lock); | 1586 | spin_lock(&hugetlb_lock); |