Merge tag 'backlight-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 75b22e22a72c1abd4865bf7c0313af5514970939..75875a741b5e7f9cb26fcd837609638b1ffafda8 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1240,8 +1240,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
        {
@@ -1250,8 +1249,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
         {
@@ -1274,8 +1272,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
        {