[BK PATCH] PCI Hotplug changes for 2.5.25

[BK PATCH] PCI Hotplug changes for 2.5.25

[Greg KH]

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


 drivers/hotplug/pci_hotplug_core.c |    5 ++++-
 drivers/hotplug/pci_hotplug_util.c |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
------

ChangeSet@1.630, 2002-07-07 11:32:52-07:00, greg@kroah.com
  PCI Hotplug: fix the dbg() macro to work properly on older versions of gcc

 drivers/hotplug/pci_hotplug_core.c |    2 +-
 drivers/hotplug/pci_hotplug_util.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
------

ChangeSet@1.629, 2002-07-07 11:28:15-07:00, greg@kroah.com
  PCI Hotplug: fix i_nlink for root inode in pcihpfs

 drivers/hotplug/pci_hotplug_core.c |    3 +++
 1 files changed, 3 insertions(+)

Re: [BK PATCH] PCI Hotplug changes for 2.5.25

[Greg KH]

For those people without BK, I'm including the patches here, like I've
been doing with the USB patches.  They are also all available in my
kernel.org directory if you don't like patches through email :)

greg k-h


# 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.628   -> 1.629  
#	drivers/hotplug/pci_hotplug_core.c	1.17    -> 1.18   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/07/07	greg@kroah.com	1.629
# PCI Hotplug: fix i_nlink for root inode in pcihpfs
# --------------------------------------------
#
diff -Nru a/drivers/hotplug/pci_hotplug_core.c b/drivers/hotplug/pci_hotplug_core.c
--- a/drivers/hotplug/pci_hotplug_core.c	Sun Jul  7 12:24:42 2002
+++ b/drivers/hotplug/pci_hotplug_core.c	Sun Jul  7 12:24:42 2002
@@ -109,6 +109,9 @@
 		case S_IFDIR:
 			inode->i_op = &pcihpfs_dir_inode_operations;
 			inode->i_fop = &simple_dir_operations;
+
+			/* directory inodes start off with i_nlink == 2 (for "." entry) */
+			inode->i_nlink++;
 			break;
 		}
 	}

Re: [BK PATCH] PCI Hotplug changes for 2.5.25

[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.629   -> 1.630  
#	drivers/hotplug/pci_hotplug_core.c	1.18    -> 1.19   
#	drivers/hotplug/pci_hotplug_util.c	1.2     -> 1.3    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/07/07	greg@kroah.com	1.630
# PCI Hotplug: fix the dbg() macro to work properly on older versions of gcc
# --------------------------------------------
#
diff -Nru a/drivers/hotplug/pci_hotplug_core.c b/drivers/hotplug/pci_hotplug_core.c
--- a/drivers/hotplug/pci_hotplug_core.c	Sun Jul  7 12:24:35 2002
+++ b/drivers/hotplug/pci_hotplug_core.c	Sun Jul  7 12:24:35 2002
@@ -48,7 +48,7 @@
 	#define MY_NAME	THIS_MODULE->name
 #endif
 
-#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt, MY_NAME, __FUNCTION__, ## arg); } while (0)
+#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0)
 #define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg)
 #define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg)
 #define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)
diff -Nru a/drivers/hotplug/pci_hotplug_util.c b/drivers/hotplug/pci_hotplug_util.c
--- a/drivers/hotplug/pci_hotplug_util.c	Sun Jul  7 12:24:35 2002
+++ b/drivers/hotplug/pci_hotplug_util.c	Sun Jul  7 12:24:35 2002
@@ -41,7 +41,7 @@
 	#define MY_NAME	THIS_MODULE->name
 #endif
 
-#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt, MY_NAME, __FUNCTION__, ## arg); } while (0)
+#define dbg(fmt, arg...) do { if (debug) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0)
 #define err(format, arg...) printk(KERN_ERR "%s: " format , MY_NAME , ## arg)
 #define info(format, arg...) printk(KERN_INFO "%s: " format , MY_NAME , ## arg)
 #define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)

Re: [BK PATCH] PCI Hotplug changes for 2.5.25

[Diego Calleja]

On Sun, 7 Jul 2002 12:43:25 -0700
Greg KH <greg@kroah.com> escribió:

> 
> For those people without BK, I'm including the patches here, like I've
> been doing with the USB patches.  They are also all available in my
> kernel.org directory if you don't like patches through email :)


Thank you very much. Some people don't use -and they don't want to use
it- bitkeeper.