From a8c4e0a53caed90f6690cbeb3ea78486d4b80fe4 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Tue, 30 Oct 2012 14:31:32 -0600
Subject: [PATCH] --- yaml --- r: 343243 b: refs/heads/master c:
 62a08c5a3173c4462239804b959c0d29dc74493b h: refs/heads/master i:   343241:
 48cfbe200163db8af04089c04b096b087cedfca9   343239:
 b58db38e0c05f7fff4fcfc0fdb72b68aa7af6a7d v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/acpi/pci_root.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0d16258b0ab9..8459040fe308 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e164f658f209b85566732bd85c62009237be0909
+refs/heads/master: 62a08c5a3173c4462239804b959c0d29dc74493b
diff --git a/trunk/drivers/acpi/pci_root.c b/trunk/drivers/acpi/pci_root.c
index bce469c0b48a..27adbfdffb0c 100644
--- a/trunk/drivers/acpi/pci_root.c
+++ b/trunk/drivers/acpi/pci_root.c
@@ -644,12 +644,19 @@ static int acpi_pci_root_start(struct acpi_device *device)
 	struct acpi_pci_root *root = acpi_driver_data(device);
 	struct acpi_pci_driver *driver;
 
+	if (system_state != SYSTEM_BOOTING)
+		pci_assign_unassigned_bus_resources(root->bus);
+
 	mutex_lock(&acpi_pci_root_lock);
 	list_for_each_entry(driver, &acpi_pci_drivers, node)
 		if (driver->add)
 			driver->add(root);
 	mutex_unlock(&acpi_pci_root_lock);
 
+	/* need to after hot-added ioapic is registered */
+	if (system_state != SYSTEM_BOOTING)
+		pci_enable_bridges(root->bus);
+
 	pci_bus_add_devices(root->bus);
 
 	return 0;