Merge branch 'linus' into sched/core, to resolve conflict

Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 10 insertions, 3 deletions

diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index d93963340c3c..14a63ed6fe09 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -482,9 +482,16 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
 
 int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
 {
-        struct pci_sysdata *sd = bridge->bus->sysdata;
-
-        ACPI_COMPANION_SET(&bridge->dev, sd->companion);
+        /*
+         * We pass NULL as parent to pci_create_root_bus(), so if it is not NULL
+         * here, pci_create_root_bus() has been called by someone else and
+         * sysdata is likely to be different from what we expect.  Let it go in
+         * that case.
+         */
+        if (!bridge->dev.parent) {
+                struct pci_sysdata *sd = bridge->bus->sysdata;
+                ACPI_COMPANION_SET(&bridge->dev, sd->companion);
+        }
         return 0;
 }