diff options
author | Steve French <sfrench@us.ibm.com> | 2006-03-20 11:58:09 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-03-20 11:58:09 -0500 |
commit | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (patch) | |
tree | 5886a08bfa1132058b06074f4666a36dc5ddd2a1 /kernel/sysctl.c | |
parent | 88274815f7477dc7550439413ab87c5ce4c5a623 (diff) | |
parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index de2d9109194e..32b48e8ee36e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -50,6 +50,9 @@ | |||
50 | #include <asm/uaccess.h> | 50 | #include <asm/uaccess.h> |
51 | #include <asm/processor.h> | 51 | #include <asm/processor.h> |
52 | 52 | ||
53 | extern int proc_nr_files(ctl_table *table, int write, struct file *filp, | ||
54 | void __user *buffer, size_t *lenp, loff_t *ppos); | ||
55 | |||
53 | #if defined(CONFIG_SYSCTL) | 56 | #if defined(CONFIG_SYSCTL) |
54 | 57 | ||
55 | /* External variables not in a header file. */ | 58 | /* External variables not in a header file. */ |
@@ -943,7 +946,7 @@ static ctl_table fs_table[] = { | |||
943 | .data = &files_stat, | 946 | .data = &files_stat, |
944 | .maxlen = 3*sizeof(int), | 947 | .maxlen = 3*sizeof(int), |
945 | .mode = 0444, | 948 | .mode = 0444, |
946 | .proc_handler = &proc_dointvec, | 949 | .proc_handler = &proc_nr_files, |
947 | }, | 950 | }, |
948 | { | 951 | { |
949 | .ctl_name = FS_MAXFILE, | 952 | .ctl_name = FS_MAXFILE, |