diff options
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 554ac4894f0f..45e4bef0012a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -1051,7 +1051,7 @@ static struct ctl_table vm_table[] = { | |||
1051 | .extra2 = &one_hundred, | 1051 | .extra2 = &one_hundred, |
1052 | }, | 1052 | }, |
1053 | #ifdef CONFIG_HUGETLB_PAGE | 1053 | #ifdef CONFIG_HUGETLB_PAGE |
1054 | { | 1054 | { |
1055 | .procname = "nr_hugepages", | 1055 | .procname = "nr_hugepages", |
1056 | .data = NULL, | 1056 | .data = NULL, |
1057 | .maxlen = sizeof(unsigned long), | 1057 | .maxlen = sizeof(unsigned long), |
@@ -1059,7 +1059,18 @@ static struct ctl_table vm_table[] = { | |||
1059 | .proc_handler = hugetlb_sysctl_handler, | 1059 | .proc_handler = hugetlb_sysctl_handler, |
1060 | .extra1 = (void *)&hugetlb_zero, | 1060 | .extra1 = (void *)&hugetlb_zero, |
1061 | .extra2 = (void *)&hugetlb_infinity, | 1061 | .extra2 = (void *)&hugetlb_infinity, |
1062 | }, | 1062 | }, |
1063 | #ifdef CONFIG_NUMA | ||
1064 | { | ||
1065 | .procname = "nr_hugepages_mempolicy", | ||
1066 | .data = NULL, | ||
1067 | .maxlen = sizeof(unsigned long), | ||
1068 | .mode = 0644, | ||
1069 | .proc_handler = &hugetlb_mempolicy_sysctl_handler, | ||
1070 | .extra1 = (void *)&hugetlb_zero, | ||
1071 | .extra2 = (void *)&hugetlb_infinity, | ||
1072 | }, | ||
1073 | #endif | ||
1063 | { | 1074 | { |
1064 | .procname = "hugetlb_shm_group", | 1075 | .procname = "hugetlb_shm_group", |
1065 | .data = &sysctl_hugetlb_shm_group, | 1076 | .data = &sysctl_hugetlb_shm_group, |
@@ -1120,7 +1131,8 @@ static struct ctl_table vm_table[] = { | |||
1120 | .data = &sysctl_max_map_count, | 1131 | .data = &sysctl_max_map_count, |
1121 | .maxlen = sizeof(sysctl_max_map_count), | 1132 | .maxlen = sizeof(sysctl_max_map_count), |
1122 | .mode = 0644, | 1133 | .mode = 0644, |
1123 | .proc_handler = proc_dointvec | 1134 | .proc_handler = proc_dointvec, |
1135 | .extra1 = &zero, | ||
1124 | }, | 1136 | }, |
1125 | #else | 1137 | #else |
1126 | { | 1138 | { |