diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-01 17:48:53 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-01 17:48:57 +1100 |
| commit | 07921f38d99634543881c1fc3437e4e5fb2df282 (patch) | |
| tree | 6baf7cff67da63893ec5d2182b28b3e6e9c11c2a /fs/efs | |
| parent | 5351027672742d789e372b99acc0207607db385e (diff) | |
| parent | f684c699592229c3aebf656363bcb0cf86df2570 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
fs/fs-writeback.c
Diffstat (limited to 'fs/efs')
| -rw-r--r-- | fs/efs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/efs/super.c b/fs/efs/super.c index 103bbd820b87..3befcc9f5d63 100644 --- a/fs/efs/super.c +++ b/fs/efs/super.c @@ -91,7 +91,7 @@ static void init_once(void *foo) inode_init_once(&ei->vfs_inode); } -static int init_inodecache(void) +static int __init init_inodecache(void) { efs_inode_cachep = kmem_cache_create("efs_inode_cache", sizeof(struct efs_inode_info), |