Merge tag 'v4.3-rc1' into kbuild/for-next

[karo-tx-linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index c5d5626289cee3a46f7e1b7d2441ca0496ba4471..9e64d7097f1ad4d5744755c977cac583debbaf38 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -656,7 +656,7 @@ asmlinkage __visible void __init start_kernel(void)
        key_init();
        security_init();
        dbg_late_init();
-       vfs_caches_init(totalram_pages);
+       vfs_caches_init();
        signals_init();
        /* rootfs populating might need page-writeback */
        page_writeback_init();
@@ -877,7 +877,6 @@ static void __init do_initcalls(void)
 static void __init do_basic_setup(void)
 {
        cpuset_init_smp();
-       usermodehelper_init();
        shmem_init();
        driver_init();
        init_irq_proc();