Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 63904bb6ae37bf30b1e0b59fc266af7a080491cf..34971becbd3c6f2db9e011c9c09f070e7eaf3c71 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -68,6 +68,7 @@
 #include <linux/async.h>
 #include <linux/kmemcheck.h>
 #include <linux/kmemtrace.h>
+#include <linux/shmem_fs.h>
 #include <trace/boot.h>
 
 #include <asm/io.h>
@@ -785,6 +786,7 @@ static void __init do_basic_setup(void)
        init_workqueues();
        cpuset_init_smp();
        usermodehelper_init();
+       init_tmpfs();
        driver_init();
        init_irq_proc();
        do_ctors();