diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-20 15:28:12 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-20 15:28:12 +1000 |
commit | 06421d58f33d0090bfb9c19b4dc4dbc413d8e460 (patch) | |
tree | 0b789c094f168fbca45c1aa2b0eec7afded469dd /mm | |
parent | a344cc7db1a218cf0b69f06dddfc577e9bd94017 (diff) | |
parent | 979cd27a7b3bbc81fb8d30f9e500afca3cd2345c (diff) |
Merge branch 'quilt/driver-core'
Conflicts:
init/main.c
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) |