Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / fs / proc / root.c

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 87dbcbef7fe4b3535d4bfdcbc7590af24d3d5f0a..5dbadecb234da01be9cc7eb5705e71363da7dfea 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -92,6 +92,8 @@ static int proc_parse_options(char *options, struct pid_namespace *pid)
 int proc_remount(struct super_block *sb, int *flags, char *data)
 {
        struct pid_namespace *pid = sb->s_fs_info;
+
+       sync_filesystem(sb);
        return !proc_parse_options(data, pid);
 }
 
@@ -183,9 +185,6 @@ void __init proc_root_init(void)
        proc_mkdir("openprom", NULL);
 #endif
        proc_tty_init();
-#ifdef CONFIG_PROC_DEVICETREE
-       proc_device_tree_init();
-#endif
        proc_mkdir("bus", NULL);
        proc_sys_init();
 }