2 files changed, 1 insertions, 6 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index 38bc3334f263..a4161abb9e76 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2252,9 +2252,7 @@ static int __init init_tmpfs(void)
                 printk(KERN_ERR "Could not register tmpfs\n");
                 goto out2;
         }
-#ifdef CONFIG_TMPFS
-        devfs_mk_dir("shm");
-#endif
+
         shm_mnt = vfs_kern_mount(&tmpfs_fs_type, MS_NOUSER,
                                 tmpfs_fs_type.name, NULL);
         if (IS_ERR(shm_mnt)) {
diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
index f9d6a9cc91c4..11ab99b8c61f 100644
--- a/mm/tiny-shmem.c
+++ b/mm/tiny-shmem.c
@@ -33,9 +33,6 @@ static int __init init_tmpfs(void)
 {
         BUG_ON(register_filesystem(&tmpfs_fs_type) != 0);
 
-#ifdef CONFIG_TMPFS
-        devfs_mk_dir("shm");
-#endif
         shm_mnt = kern_mount(&tmpfs_fs_type);
         BUG_ON(IS_ERR(shm_mnt));