diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 14:13:26 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 14:13:26 +1000 |
commit | c1d70ebaba0a9e0539c93e6b3997acaf50a70ba2 (patch) | |
tree | 4f024de825666331af82e39da49e71dcc65d2e45 /mm | |
parent | ddf3fc3996f00d926542dd3a9e4f7a01d68be525 (diff) | |
parent | 0e16dea04bf73a9b90c0ee65108caa971c7647e9 (diff) |
Merge branch 'quilt/driver-core'
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 d713239ce2ce..044465116ac3 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2298,8 +2298,7 @@ static void shmem_put_super(struct super_block *sb) sb->s_fs_info = NULL; } -static int shmem_fill_super(struct super_block *sb, - void *data, int silent) +int shmem_fill_super(struct super_block *sb, void *data, int silent) { struct inode *inode; struct dentry *root; @@ -2519,7 +2518,7 @@ static struct file_system_type tmpfs_fs_type = { .kill_sb = kill_litter_super, }; -static int __init init_tmpfs(void) +int __init init_tmpfs(void) { int error; @@ -2576,7 +2575,7 @@ static struct file_system_type tmpfs_fs_type = { .kill_sb = kill_litter_super, }; -static int __init init_tmpfs(void) +int __init init_tmpfs(void) { BUG_ON(register_filesystem(&tmpfs_fs_type) != 0); @@ -2687,5 +2686,3 @@ int shmem_zero_setup(struct vm_area_struct *vma) vma->vm_ops = &shmem_vm_ops; return 0; } - -module_init(init_tmpfs) |