[Xen-changelog] [linux-2.6.18-xen] pci/iomulti: adjustments for CONFIG_HOTPLUG_PCI=m

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1278675422 -3600
# Node ID c977b4bfc8543a12edcc3faab7bbc9d240d8c87a
# Parent  7b350604ce957e12146afc432c37c81c0b75e8fc
pci/iomulti: adjustments for CONFIG_HOTPLUG_PCI=m

The code supposed to deal with hot added/removed devices is also
needed when the core PCI hotplug code lives in a module.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 drivers/pci/iomulti.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff -r 7b350604ce95 -r c977b4bfc854 drivers/pci/iomulti.c
--- a/drivers/pci/iomulti.c     Fri Jun 18 14:11:57 2010 +0100
+++ b/drivers/pci/iomulti.c     Fri Jul 09 12:37:02 2010 +0100
@@ -245,7 +245,7 @@ static void pci_iomul_switch_add_locked(
        list_add(&sw->list, &switch_list);
 }
 
-#ifdef CONFIG_HOTPLUG_PCI
+#if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)
 static void pci_iomul_switch_del_locked(struct pci_iomul_switch *sw)
 {
        BUG_ON(!mutex_is_locked(&switch_list_lock));
@@ -337,7 +337,7 @@ static void pci_iomul_slot_add_locked(st
        list_add(&slot->sibling, &sw->slots);
 }
 
-#ifdef CONFIG_HOTPLUG_PCI
+#if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)
 static void pci_iomul_slot_del_locked(struct pci_iomul_switch *sw,
                                       struct pci_iomul_slot *slot)
 {
@@ -895,7 +895,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_
                        quirk_iomul_reassign_ioresource);
 
 /*****************************************************************************/
-#ifdef CONFIG_HOTPLUG_PCI
+#if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)
 static int __devinit __pci_iomul_notifier_del_device(struct pci_dev *pdev)
 {
        struct pci_iomul_switch *sw;
@@ -990,7 +990,7 @@ static int __devinit pci_iomul_notifier(
        return 0;
 }
 
-static struct notifier_block pci_iomul_nb = {
+static struct notifier_block __devinitdata pci_iomul_nb = {
         .notifier_call = pci_iomul_notifier,
 };
 
@@ -1383,7 +1383,7 @@ static struct miscdevice pci_iomul_miscd
        .fops = &pci_iomul_fops,
 };
 
-static int pci_iomul_init(void)
+static int __init pci_iomul_init(void)
 {
        int error;
        error = misc_register(&pci_iomul_miscdev);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog