]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
x86/PCI: move final fixups from __init to __devinit
authorMyron Stowe <myron.stowe@redhat.com>
Mon, 9 Jul 2012 21:36:33 +0000 (15:36 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 10 Jul 2012 02:56:45 +0000 (20:56 -0600)
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>
arch/x86/kernel/quirks.c

index 03920a15a632289605c6f0ba0b563d64065214a7..1b27de563561ae1d6d0d58d0f29f224a4c6602a3 100644 (file)
@@ -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;