diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/shmem.c | 5 | ||||
-rw-r--r-- | mm/tiny-shmem.c | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index ea64c07cbe72..b14ff817d162 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/config.h> | 26 | #include <linux/config.h> |
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
29 | #include <linux/devfs_fs_kernel.h> | ||
30 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
31 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
32 | #include <linux/mman.h> | 31 | #include <linux/mman.h> |
@@ -2252,9 +2251,7 @@ static int __init init_tmpfs(void) | |||
2252 | printk(KERN_ERR "Could not register tmpfs\n"); | 2251 | printk(KERN_ERR "Could not register tmpfs\n"); |
2253 | goto out2; | 2252 | goto out2; |
2254 | } | 2253 | } |
2255 | #ifdef CONFIG_TMPFS | 2254 | |
2256 | devfs_mk_dir("shm"); | ||
2257 | #endif | ||
2258 | shm_mnt = vfs_kern_mount(&tmpfs_fs_type, MS_NOUSER, | 2255 | shm_mnt = vfs_kern_mount(&tmpfs_fs_type, MS_NOUSER, |
2259 | tmpfs_fs_type.name, NULL); | 2256 | tmpfs_fs_type.name, NULL); |
2260 | if (IS_ERR(shm_mnt)) { | 2257 | if (IS_ERR(shm_mnt)) { |
diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c index f9d6a9cc91c4..5f2cbf0f153c 100644 --- a/mm/tiny-shmem.c +++ b/mm/tiny-shmem.c | |||
@@ -12,7 +12,6 @@ | |||
12 | 12 | ||
13 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/devfs_fs_kernel.h> | ||
16 | #include <linux/vfs.h> | 15 | #include <linux/vfs.h> |
17 | #include <linux/mount.h> | 16 | #include <linux/mount.h> |
18 | #include <linux/file.h> | 17 | #include <linux/file.h> |
@@ -33,9 +32,6 @@ static int __init init_tmpfs(void) | |||
33 | { | 32 | { |
34 | BUG_ON(register_filesystem(&tmpfs_fs_type) != 0); | 33 | BUG_ON(register_filesystem(&tmpfs_fs_type) != 0); |
35 | 34 | ||
36 | #ifdef CONFIG_TMPFS | ||
37 | devfs_mk_dir("shm"); | ||
38 | #endif | ||
39 | shm_mnt = kern_mount(&tmpfs_fs_type); | 35 | shm_mnt = kern_mount(&tmpfs_fs_type); |
40 | BUG_ON(IS_ERR(shm_mnt)); | 36 | BUG_ON(IS_ERR(shm_mnt)); |
41 | 37 | ||