Merge tag 'v3.17' into p/abusse/merge_upgrade
[projects/modsched/linux.git] / kernel / sysctl.c
index 53da8e5..1daeef1 100644 (file)
@@ -1249,8 +1249,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(unsigned long),
                .mode           = 0644,
                .proc_handler   = hugetlb_sysctl_handler,
-               .extra1         = (void *)&hugetlb_zero,
-               .extra2         = (void *)&hugetlb_infinity,
+               .extra1         = &zero,
        },
 #ifdef CONFIG_NUMA
        {
@@ -1259,8 +1258,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(unsigned long),
                .mode           = 0644,
                .proc_handler   = &hugetlb_mempolicy_sysctl_handler,
-               .extra1         = (void *)&hugetlb_zero,
-               .extra2         = (void *)&hugetlb_infinity,
+               .extra1         = &zero,
        },
 #endif
         {
@@ -1283,8 +1281,7 @@ static struct ctl_table vm_table[] = {
                .maxlen         = sizeof(unsigned long),
                .mode           = 0644,
                .proc_handler   = hugetlb_overcommit_handler,
-               .extra1         = (void *)&hugetlb_zero,
-               .extra2         = (void *)&hugetlb_infinity,
+               .extra1         = &zero,
        },
 #endif
        {