forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mm, hugetlb: remove hugetlb_zero and hugetlb_infinity

Browse source 
They are unnecessary: "zero" can be used in place of "hugetlb_zero" and
passing extra2 == NULL is equivalent to infinity.

Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Rientjes 2014-08-06 16:06:54 -07:00 • committed by Linus Torvalds
commit ed4d4902eb
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/hugetlb.h
View file

@ -87,7 +87,6 @@ pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud);
#endif #endif
extern unsigned long hugepages_treat_as_movable; extern unsigned long hugepages_treat_as_movable;
extern const unsigned long hugetlb_zero, hugetlb_infinity;
extern int sysctl_hugetlb_shm_group; extern int sysctl_hugetlb_shm_group;
extern struct list_head huge_boot_pages; extern struct list_head huge_boot_pages;

9
kernel/sysctl.c
View file

@ -1240,8 +1240,7 @@ static struct ctl_table vm_table[] = {
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = hugetlb_sysctl_handler, .proc_handler = hugetlb_sysctl_handler,
.extra1 = (void *)&hugetlb_zero, .extra1 = &zero,
.extra2 = (void *)&hugetlb_infinity,
}, },
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
{ {
@ -1250,8 +1249,7 @@ static struct ctl_table vm_table[] = {
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = &hugetlb_mempolicy_sysctl_handler, .proc_handler = &hugetlb_mempolicy_sysctl_handler,
.extra1 = (void *)&hugetlb_zero, .extra1 = &zero,
.extra2 = (void *)&hugetlb_infinity,
}, },
#endif #endif
{ {
@ -1274,8 +1272,7 @@ static struct ctl_table vm_table[] = {
.maxlen = sizeof(unsigned long), .maxlen = sizeof(unsigned long),
.mode = 0644, .mode = 0644,
.proc_handler = hugetlb_overcommit_handler, .proc_handler = hugetlb_overcommit_handler,
.extra1 = (void *)&hugetlb_zero, .extra1 = &zero,
.extra2 = (void *)&hugetlb_infinity,
}, },
#endif #endif
{ {

1
mm/hugetlb.c
View file

@ -35,7 +35,6 @@
#include <linux/node.h> #include <linux/node.h>
#include "internal.h" #include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
unsigned long hugepages_treat_as_movable; unsigned long hugepages_treat_as_movable;
int hugetlb_max_hstate __read_mostly; int hugetlb_max_hstate __read_mostly;