diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/shmem.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 5a0b3d4055f3..bd20f8bb02aa 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -2298,8 +2298,7 @@ static void shmem_put_super(struct super_block *sb) | |||
2298 | sb->s_fs_info = NULL; | 2298 | sb->s_fs_info = NULL; |
2299 | } | 2299 | } |
2300 | 2300 | ||
2301 | static int shmem_fill_super(struct super_block *sb, | 2301 | int shmem_fill_super(struct super_block *sb, void *data, int silent) |
2302 | void *data, int silent) | ||
2303 | { | 2302 | { |
2304 | struct inode *inode; | 2303 | struct inode *inode; |
2305 | struct dentry *root; | 2304 | struct dentry *root; |
@@ -2519,7 +2518,7 @@ static struct file_system_type tmpfs_fs_type = { | |||
2519 | .kill_sb = kill_litter_super, | 2518 | .kill_sb = kill_litter_super, |
2520 | }; | 2519 | }; |
2521 | 2520 | ||
2522 | static int __init init_tmpfs(void) | 2521 | int __init init_tmpfs(void) |
2523 | { | 2522 | { |
2524 | int error; | 2523 | int error; |
2525 | 2524 | ||
@@ -2576,7 +2575,7 @@ static struct file_system_type tmpfs_fs_type = { | |||
2576 | .kill_sb = kill_litter_super, | 2575 | .kill_sb = kill_litter_super, |
2577 | }; | 2576 | }; |
2578 | 2577 | ||
2579 | static int __init init_tmpfs(void) | 2578 | int __init init_tmpfs(void) |
2580 | { | 2579 | { |
2581 | BUG_ON(register_filesystem(&tmpfs_fs_type) != 0); | 2580 | BUG_ON(register_filesystem(&tmpfs_fs_type) != 0); |
2582 | 2581 | ||
@@ -2687,5 +2686,3 @@ int shmem_zero_setup(struct vm_area_struct *vma) | |||
2687 | vma->vm_ops = &shmem_vm_ops; | 2686 | vma->vm_ops = &shmem_vm_ops; |
2688 | return 0; | 2687 | return 0; |
2689 | } | 2688 | } |
2690 | |||
2691 | module_init(init_tmpfs) | ||