From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Sun, 7 Jul 2002 15:43:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Sun, 7 Jul 2002 15:43:40 -0400 Received: from 12-231-243-94.client.attbi.com ([12.231.243.94]:28174 "HELO kroah.com") by vger.kernel.org with SMTP id ; Sun, 7 Jul 2002 15:43:37 -0400 Date: Sun, 7 Jul 2002 12:44:04 -0700 From: Greg KH To: linux-kernel@vger.kernel.org Subject: Re: [BK PATCH] PCI Hotplug changes for 2.5.25 Message-ID: <20020707194404.GP17922@kroah.com> References: <20020707193331.GA17922@kroah.com> <20020707194324.GO17922@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020707194324.GO17922@kroah.com> User-Agent: Mutt/1.4i X-Operating-System: Linux 2.2.21 (i586) Reply-By: Sun, 09 Jun 2002 18:28:27 -0700 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org # 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)