[BK PATCH] PCI Hotplug changes for 2.4.20-pre4

[BK PATCH] PCI Hotplug changes for 2.4.20-pre4

[Greg KH]

Hi,

This includes a fix for the oops people are having when they access
pcihpfs and a Configure.help update for the ACPI PCI Hotplug driver.

	Pull from:  bk://linuxusb.bkbits.net/pci_hp-2.4

Patches will follow.

thanks,

greg k-h

 Documentation/Configure.help       |   10 ++++++++++
 drivers/hotplug/pci_hotplug_core.c |    8 +-------
 2 files changed, 11 insertions(+), 7 deletions(-)
-----

ChangeSet@1.589, 2002-08-20 17:23:01-07:00, greg@kroah.com
  PCI Hotplug: fixed oops when accessing pcihpfs.

 drivers/hotplug/pci_hotplug_core.c |    8 +-------
 1 files changed, 1 insertion(+), 7 deletions(-)
------

ChangeSet@1.588, 2002-08-20 17:22:04-07:00, greg@kroah.com
  added Configure.help entry for the ACPI PCI Hotplug driver.

 Documentation/Configure.help |   10 ++++++++++
 1 files changed, 10 insertions(+)
------

Re: [BK PATCH] PCI Hotplug changes for 2.4.20-pre4

[Greg KH]

# 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.587   -> 1.588  
#	Documentation/Configure.help	1.120   -> 1.121  
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/08/20	greg@kroah.com	1.588
# added Configure.help entry for the ACPI PCI Hotplug driver.
# --------------------------------------------
#
diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help
--- a/Documentation/Configure.help	Wed Aug 21 11:23:27 2002
+++ b/Documentation/Configure.help	Wed Aug 21 11:23:27 2002
@@ -3644,6 +3644,16 @@
 
   When in doubt, say N.
 
+ACPI PCI Hotplug driver
+CONFIG_HOTPLUG_PCI_ACPI
+  Say Y here if you have a system that supports PCI Hotplug using
+  ACPI.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called acpiphp.o. If you want to compile it
+  as a module, say M here and read <file:Documentation/modules.txt>.
+
 MCA support
 CONFIG_MCA
   MicroChannel Architecture is found in some IBM PS/2 machines and

Re: [BK PATCH] PCI Hotplug changes for 2.4.20-pre4

[Greg KH]

# 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.588   -> 1.589  
#	drivers/hotplug/pci_hotplug_core.c	1.3     -> 1.4    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/08/20	greg@kroah.com	1.589
# PCI Hotplug: fixed oops when accessing pcihpfs.
# --------------------------------------------
#
diff -Nru a/drivers/hotplug/pci_hotplug_core.c b/drivers/hotplug/pci_hotplug_core.c
--- a/drivers/hotplug/pci_hotplug_core.c	Wed Aug 21 11:23:25 2002
+++ b/drivers/hotplug/pci_hotplug_core.c	Wed Aug 21 11:23:25 2002
@@ -76,7 +76,6 @@
 };
 
 static struct super_operations pcihpfs_ops;
-static struct file_operations pcihpfs_dir_operations;
 static struct file_operations default_file_operations;
 static struct inode_operations pcihpfs_dir_inode_operations;
 static struct vfsmount *pcihpfs_mount;	/* one of the mounts of our fs for reference counting */
@@ -122,7 +121,7 @@
 			break;
 		case S_IFDIR:
 			inode->i_op = &pcihpfs_dir_inode_operations;
-			inode->i_fop = &pcihpfs_dir_operations;
+			inode->i_fop = &dcache_dir_ops;
 			break;
 		}
 	}
@@ -234,11 +233,6 @@
 
 	return 0;
 }
-
-static struct file_operations pcihpfs_dir_operations = {
-	read:		generic_read_dir,
-	readdir:	dcache_readdir,
-};
 
 static struct file_operations default_file_operations = {
 	read:		default_read_file,