Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6

[~andy/linux] / init / main.c

diff --git a/init/main.c b/init/main.c
index 2c76efb513c2c2e8f3c94a3c87665a3c6c9cc166..415548e808d2873fda39a123a202186b9968dd7f 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -282,10 +282,6 @@ static int __init unknown_bootoption(char *param, char *val)
        return 0;
 }
 
-#ifdef CONFIG_DEBUG_PAGEALLOC
-int __read_mostly debug_pagealloc_enabled = 0;
-#endif
-
 static int __init init_setup(char *str)
 {
        unsigned int i;
@@ -596,7 +592,6 @@ asmlinkage void __init start_kernel(void)
        }
 #endif
        page_cgroup_init();
-       enable_debug_pagealloc();
        debug_objects_mem_init();
        kmemleak_init();
        setup_per_cpu_pageset();