diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-20 11:48:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-20 11:48:56 +0200 |
| commit | 40a2ea1bd988e3bbdb07a0708681fdb05cd7d267 (patch) | |
| tree | 05806aaa27a4b0516a14a8ccf703c1501500e588 /include/linux/fs.h | |
| parent | a897b5f0393a8a05d230c9248dc5324fb30720a0 (diff) | |
| parent | 196676497f2507966f99abef63bede6a8550f8b3 (diff) | |
| download | cachepc-linux-40a2ea1bd988e3bbdb07a0708681fdb05cd7d267.tar.gz cachepc-linux-40a2ea1bd988e3bbdb07a0708681fdb05cd7d267.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes before adding more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index cc008c338f5a..84b783f277f7 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -55,7 +55,8 @@ struct vm_fault; extern void __init inode_init(void); extern void __init inode_init_early(void); -extern void __init files_init(unsigned long); +extern void __init files_init(void); +extern void __init files_maxfiles_init(void); extern struct files_stat_struct files_stat; extern unsigned long get_max_files(void); @@ -2245,7 +2246,7 @@ extern int ioctl_preallocate(struct file *filp, void __user *argp); /* fs/dcache.c */ extern void __init vfs_caches_init_early(void); -extern void __init vfs_caches_init(unsigned long); +extern void __init vfs_caches_init(void); extern struct kmem_cache *names_cachep; |