Messages in this thread Patch in this message | | | Date | Thu, 19 Sep 2002 17:57:22 -0700 | From | Greg KH <> | Subject | Re: [BK PATCH] PCI hotplug changes for 2.5.36 |
| |
# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.563 -> 1.564 # drivers/hotplug/pci_hotplug_core.c 1.23 -> 1.24 # drivers/pci/proc.c 1.18 -> 1.19 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/09/19 greg@kroah.com 1.564 # PCI Hotplug: created /proc/bus/pci/slots for pcihpfs to be mounted on. # # proc_bus_pci_dir had to be exported for this to work properly. # -------------------------------------------- # diff -Nru a/drivers/hotplug/pci_hotplug_core.c b/drivers/hotplug/pci_hotplug_core.c --- a/drivers/hotplug/pci_hotplug_core.c Thu Sep 19 17:50:33 2002 +++ b/drivers/hotplug/pci_hotplug_core.c Thu Sep 19 17:50:33 2002 @@ -39,6 +39,7 @@ #include <linux/namei.h> #include <linux/pci.h> #include <linux/dnotify.h> +#include <linux/proc_fs.h> #include <asm/uaccess.h> #include "pci_hotplug.h" @@ -113,6 +114,12 @@ "133 MHz PCIX 533", /* 0x13 */ }; +#ifdef CONFIG_PROC_FS +extern struct proc_dir_entry *proc_bus_pci_dir; +static struct proc_dir_entry *slotdir = NULL; +static const char *slotdir_name = "slots"; +#endif + static struct inode *pcihpfs_get_inode (struct super_block *sb, int mode, int dev) { struct inode *inode = new_inode(sb); @@ -1265,6 +1272,11 @@ goto exit; } +#ifdef CONFIG_PROC_FS + /* create mount point for pcihpfs */ + slotdir = proc_mkdir(slotdir_name, proc_bus_pci_dir); +#endif + info (DRIVER_DESC " version: " DRIVER_VERSION "\n"); exit: @@ -1274,6 +1286,11 @@ static void __exit pci_hotplug_exit (void) { unregister_filesystem(&pcihpfs_type); + +#ifdef CONFIG_PROC_FS + if (slotdir) + remove_proc_entry(slotdir_name, proc_bus_pci_dir); +#endif } module_init(pci_hotplug_init); diff -Nru a/drivers/pci/proc.c b/drivers/pci/proc.c --- a/drivers/pci/proc.c Thu Sep 19 17:50:33 2002 +++ b/drivers/pci/proc.c Thu Sep 19 17:50:33 2002 @@ -371,7 +371,7 @@ show: show_device }; -static struct proc_dir_entry *proc_bus_pci_dir; +struct proc_dir_entry *proc_bus_pci_dir; /* driverfs files */ static ssize_t pci_show_irq(struct device * dev, char * buf, size_t count, loff_t off) @@ -621,5 +621,6 @@ EXPORT_SYMBOL(pci_proc_detach_device); EXPORT_SYMBOL(pci_proc_attach_bus); EXPORT_SYMBOL(pci_proc_detach_bus); +EXPORT_SYMBOL(proc_bus_pci_dir); #endif - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |