aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-07-17 07:03:45 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 13:23:03 -0400
commit62239ac2b301abc397e70986649666cfb7835907 (patch)
tree296ddcc9a0aa9ce847b9eab3eb3af29e8c148f13
parentf284ce7269031947326bac6bb19a977705276222 (diff)
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.h5
-rw-r--r--kernel/sysctl.c4
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;
283#include <linux/init.h> 283#include <linux/init.h>
284#include <linux/pid.h> 284#include <linux/pid.h>
285#include <linux/mutex.h> 285#include <linux/mutex.h>
286#include <linux/sysctl.h>
286 287
287#include <asm/atomic.h> 288#include <asm/atomic.h>
288#include <asm/semaphore.h> 289#include <asm/semaphore.h>
@@ -2050,5 +2051,9 @@ static inline void free_secdata(void *secdata)
2050{ } 2051{ }
2051#endif /* CONFIG_SECURITY */ 2052#endif /* CONFIG_SECURITY */
2052 2053
2054int proc_nr_files(ctl_table *table, int write, struct file *filp,
2055 void __user *buffer, size_t *lenp, loff_t *ppos);
2056
2057
2053#endif /* __KERNEL__ */ 2058#endif /* __KERNEL__ */
2054#endif /* _LINUX_FS_H */ 2059#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 @@
29#include <linux/utsname.h> 29#include <linux/utsname.h>
30#include <linux/capability.h> 30#include <linux/capability.h>
31#include <linux/smp_lock.h> 31#include <linux/smp_lock.h>
32#include <linux/fs.h>
32#include <linux/init.h> 33#include <linux/init.h>
33#include <linux/kernel.h> 34#include <linux/kernel.h>
34#include <linux/kobject.h> 35#include <linux/kobject.h>
@@ -49,9 +50,6 @@
49#include <asm/uaccess.h> 50#include <asm/uaccess.h>
50#include <asm/processor.h> 51#include <asm/processor.h>
51 52
52extern int proc_nr_files(ctl_table *table, int write, struct file *filp,
53 void __user *buffer, size_t *lenp, loff_t *ppos);
54
55#ifdef CONFIG_X86 53#ifdef CONFIG_X86
56#include <asm/nmi.h> 54#include <asm/nmi.h>
57#include <asm/stacktrace.h> 55#include <asm/stacktrace.h>