From: Myron Stowe <myron.stowe@redhat.com>
Date: Mon, 9 Jul 2012 21:36:33 +0000 (-0600)
Subject: x86/PCI: move final fixups from __init to __devinit
X-Git-Tag: v3.6-rc1~112^2~8^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ce6ed7e7f7e12af1a08cc32ad33d1b3202fede64;p=~emulex%2Finfiniband.git

x86/PCI: move final fixups from __init to __devinit

Final fixups are executed during device enumeration.  If we support
hotplug, this may be after boot, so final fixups cannot be __init.

[bhelgaas: changelog]
Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---

diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 03920a15a63..1b27de56356 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -512,7 +512,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS,
 
 #if defined(CONFIG_PCI) && defined(CONFIG_NUMA)
 /* Set correct numa_node information for AMD NB functions */
-static void __init quirk_amd_nb_node(struct pci_dev *dev)
+static void __devinit quirk_amd_nb_node(struct pci_dev *dev)
 {
 	struct pci_dev *nb_ht;
 	unsigned int devfn;