diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /fs/proc/root.c | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'fs/proc/root.c')
| -rw-r--r-- | fs/proc/root.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index ad3a541cb..6225b3fd9 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -177,14 +177,14 @@ struct proc_dir_entry proc_sys_root = { #if defined(CONFIG_SUN_OPENPROMFS) || defined(CONFIG_SUN_OPENPROMFS_MODULE) -static int (*proc_openprom_defreaddir_ptr)(struct inode *, struct file *, void *, filldir_t); +static int (*proc_openprom_defreaddir_ptr)(struct file *, void *, filldir_t); static int (*proc_openprom_deflookup_ptr)(struct inode *, struct dentry *); void (*proc_openprom_use)(struct inode *, int) = 0; static struct openpromfs_dev *proc_openprom_devices = NULL; static ino_t proc_openpromdev_ino = PROC_OPENPROMD_FIRST; struct inode_operations * -proc_openprom_register(int (*readdir)(struct inode *, struct file *, void *, filldir_t), +proc_openprom_register(int (*readdir)(struct file *, void *, filldir_t), int (*lookup)(struct inode *, struct dentry *), void (*use)(struct inode *, int), struct openpromfs_dev ***devices) @@ -236,14 +236,13 @@ proc_openprom_deregister(void) #if defined(CONFIG_SUN_OPENPROMFS_MODULE) && defined(CONFIG_KMOD) static int -proc_openprom_defreaddir(struct inode * inode, struct file * filp, - void * dirent, filldir_t filldir) +proc_openprom_defreaddir(struct file * filp, void * dirent, filldir_t filldir) { request_module("openpromfs"); if ((proc_openprom_inode_operations.default_file_ops)->readdir != proc_openprom_defreaddir) return (proc_openprom_inode_operations.default_file_ops)->readdir - (inode, filp, dirent, filldir); + (filp, dirent, filldir); return -EINVAL; } #define OPENPROM_DEFREADDIR proc_openprom_defreaddir @@ -499,13 +498,6 @@ static struct proc_dir_entry proc_root_version = { S_IFREG | S_IRUGO, 1, 0, 0, 0, &proc_array_inode_operations }; -#ifdef CONFIG_PCI_OLD_PROC -static struct proc_dir_entry proc_root_pci = { - PROC_PCI, 3, "pci", - S_IFREG | S_IRUGO, 1, 0, 0, - 0, &proc_array_inode_operations -}; -#endif #ifdef CONFIG_ZORRO static struct proc_dir_entry proc_root_zorro = { PROC_ZORRO, 5, "zorro", @@ -640,9 +632,6 @@ void proc_root_init(void) proc_register(&proc_root, &proc_root_meminfo); proc_register(&proc_root, &proc_root_kmsg); proc_register(&proc_root, &proc_root_version); -#ifdef CONFIG_PCI_OLD_PROC - proc_register(&proc_root, &proc_root_pci); -#endif #ifdef CONFIG_ZORRO proc_register(&proc_root, &proc_root_zorro); #endif @@ -707,9 +696,6 @@ void proc_root_init(void) #endif proc_bus = create_proc_entry("bus", S_IFDIR, 0); -#ifdef CONFIG_PCI - proc_bus_pci_init(); -#endif } /* |