diff options
| author | Adrian Bunk | 2007-07-17 13:03:45 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-07-17 19:23:03 +0200 |
| commit | 62239ac2b301abc397e70986649666cfb7835907 (patch) | |
| tree | 296ddcc9a0aa9ce847b9eab3eb3af29e8c148f13 | |
| parent | PTRACE_POKEDATA consolidation (diff) | |
| download | kernel-qcow2-linux-62239ac2b301abc397e70986649666cfb7835907.tar.gz kernel-qcow2-linux-62239ac2b301abc397e70986649666cfb7835907.tar.xz kernel-qcow2-linux-62239ac2b301abc397e70986649666cfb7835907.zip | |
proper prototype for proc_nr_files()
Add a proper prototype for proc_nr_files() in include/linux/fs.h
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/fs.h | 5 | ||||
| -rw-r--r-- | kernel/sysctl.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index e68780810279..b3a9f0db9d80 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -283,6 +283,7 @@ extern int dir_notify_enable; #include <linux/init.h> #include <linux/pid.h> #include <linux/mutex.h> +#include <linux/sysctl.h> #include <asm/atomic.h> #include <asm/semaphore.h> @@ -2050,5 +2051,9 @@ static inline void free_secdata(void *secdata) { } #endif /* CONFIG_SECURITY */ +int proc_nr_files(ctl_table *table, int write, struct file *filp, + void __user *buffer, size_t *lenp, loff_t *ppos); + + #endif /* __KERNEL__ */ #endif /* _LINUX_FS_H */ diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 48dae075d5c2..7063ebc6db05 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -29,6 +29,7 @@ #include <linux/utsname.h> #include <linux/capability.h> #include <linux/smp_lock.h> +#include <linux/fs.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/kobject.h> @@ -49,9 +50,6 @@ #include <asm/uaccess.h> #include <asm/processor.h> -extern int proc_nr_files(ctl_table *table, int write, struct file *filp, - void __user *buffer, size_t *lenp, loff_t *ppos); - #ifdef CONFIG_X86 #include <asm/nmi.h> #include <asm/stacktrace.h> |