summaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-22 23:05:57 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-22 23:05:57 +0000
commit51d3b7814cdccef9188240fe0cbd8d97ff2c7470 (patch)
tree5cbb01d0323d4f63ade66bdf48ba4a91aaa6df16 /kernel/sysctl.c
parent52273a23c9a84336b93a35e4847fc88fac7eb0e4 (diff)
Merge with Linux 2.3.7.
WARNING: 2.3.7 is known to eat filesystems for breakfast and little children for lunch, so if you try this on your machine make backups first ...
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index ed9824136..2d4fb7169 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -121,11 +121,14 @@ struct inode_operations proc_sys_inode_operations =
NULL, /* rename */
NULL, /* readlink */
NULL, /* follow_link */
+ NULL, /* bmap */
NULL, /* readpage */
NULL, /* writepage */
- NULL, /* bmap */
+ NULL, /* flushpage */
NULL, /* truncate */
- proc_sys_permission
+ proc_sys_permission, /* permission */
+ NULL, /* smap */
+ NULL /* revalidate */
};
extern struct proc_dir_entry proc_sys_root;