diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /kernel/sysctl.c | |
parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 50ba37060..9a6a7a74d 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -111,17 +111,8 @@ static int proc_sys_permission(struct inode *, int); struct file_operations proc_sys_file_operations = { - NULL, /* lseek */ - proc_readsys, /* read */ - proc_writesys, /* write */ - NULL, /* readdir */ - NULL, /* poll */ - NULL, /* ioctl */ - NULL, /* mmap */ - NULL, /* no special open code */ - NULL, /* no special flush code */ - NULL, /* no special release code */ - NULL /* can't fsync */ + read: proc_readsys, + write: proc_writesys, }; struct inode_operations proc_sys_inode_operations = @@ -138,9 +129,6 @@ struct inode_operations proc_sys_inode_operations = NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ - NULL, /* get_block */ - NULL, /* readpage */ - NULL, /* writepage */ NULL, /* truncate */ proc_sys_permission, /* permission */ NULL /* revalidate */ |