Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / arch / x86 / pci / amd_bus.c

diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index a313a7fb6b862e26b893ad8f5058e8767bf146c1..e88f4c53d7f6b41d4268b4eb51fad5badd514c2b 100644 (file)
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -370,10 +370,13 @@ static int __init pci_io_ecs_init(void)
        if (early_pci_allowed())
                pci_enable_pci_io_ecs();
 
-       register_cpu_notifier(&amd_cpu_notifier);
+       cpu_notifier_register_begin();
        for_each_online_cpu(cpu)
                amd_cpu_notify(&amd_cpu_notifier, (unsigned long)CPU_ONLINE,
                               (void *)(long)cpu);
+       __register_cpu_notifier(&amd_cpu_notifier);
+       cpu_notifier_register_done();
+
        pci_probe |= PCI_HAS_IO_ECS;
 
        return 0;