Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[safe/jmp/linux-2.6] / arch / s390 / mm / cmm.c

diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index 5e5f384..76a3637 100644 (file)
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -345,30 +345,29 @@ static struct ctl_table cmm_table[] = {
        {
                .procname       = "cmm_pages",
                .mode           = 0644,
-               .proc_handler   = &cmm_pages_handler,
+               .proc_handler   = cmm_pages_handler,
        },
        {
                .procname       = "cmm_timed_pages",
                .mode           = 0644,
-               .proc_handler   = &cmm_pages_handler,
+               .proc_handler   = cmm_pages_handler,
        },
        {
                .procname       = "cmm_timeout",
                .mode           = 0644,
-               .proc_handler   = &cmm_timeout_handler,
+               .proc_handler   = cmm_timeout_handler,
        },
-       { .ctl_name = 0 }
+       { }
 };
 
 static struct ctl_table cmm_dir_table[] = {
        {
-               .ctl_name       = CTL_VM,
                .procname       = "vm",
                .maxlen         = 0,
                .mode           = 0555,
                .child          = cmm_table,
        },
-       { .ctl_name = 0 }
+       { }
 };
 #endif