kernel: update linux 3.2 to 3.2.9

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-3.2 / 0000-pci-backport.patch

diff --git a/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch b/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
index 5a6a9aedac431e2cb867328febc4df62ce59f408..b1eed44d6f8f458ec62318c832adfd0ad2fa69a6 100644 (file)
--- a/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
+++ b/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
@@ -1358,7 +1358,7 @@
        int busnum;
  };
  
-@@ -261,23 +261,20 @@ static void add_resources(struct pci_roo
+@@ -275,23 +275,20 @@ static void add_resources(struct pci_roo
                                 "ignoring host bridge window %pR (conflicts with %s %pR)\n",
                                 res, conflict->name, conflict);
                else
@@ -1385,7 +1385,7 @@
        acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_resource,
                                &info);
        if (!info.res_num)
-@@ -286,7 +283,7 @@ get_current_resources(struct acpi_device
+@@ -300,7 +297,7 @@ get_current_resources(struct acpi_device
        size = sizeof(*info.res) * info.res_num;
        info.res = kmalloc(size, GFP_KERNEL);
        if (!info.res)
@@ -1394,7 +1394,7 @@
  
        info.name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum);
        if (!info.name)
-@@ -301,8 +298,6 @@ get_current_resources(struct acpi_device
+@@ -315,8 +312,6 @@ get_current_resources(struct acpi_device
  
  name_alloc_fail:
        kfree(info.res);
@@ -1403,7 +1403,7 @@
  }
  
  struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
-@@ -310,6 +305,7 @@ struct pci_bus * __devinit pci_acpi_scan
+@@ -324,6 +319,7 @@ struct pci_bus * __devinit pci_acpi_scan
        struct acpi_device *device = root->device;
        int domain = root->segment;
        int busnum = root->secondary.start;
@@ -1411,7 +1411,7 @@
        struct pci_bus *bus;
        struct pci_sysdata *sd;
        int node;
-@@ -364,11 +360,15 @@ struct pci_bus * __devinit pci_acpi_scan
+@@ -378,11 +374,15 @@ struct pci_bus * __devinit pci_acpi_scan
                memcpy(bus->sysdata, sd, sizeof(*sd));
                kfree(sd);
        } else {
@@ -2071,7 +2071,7 @@
  /**
 --- a/drivers/pci/probe.c
 +++ b/drivers/pci/probe.c
-@@ -1522,12 +1522,14 @@ unsigned int __devinit pci_scan_child_bu
+@@ -1527,12 +1527,14 @@ unsigned int __devinit pci_scan_child_bu
        return max;
  }
  
@@ -2089,7 +2089,7 @@
  
        b = pci_alloc_bus();
        if (!b)
-@@ -1577,8 +1579,20 @@ struct pci_bus * pci_create_bus(struct d
+@@ -1582,8 +1584,20 @@ struct pci_bus * pci_create_bus(struct d
        pci_create_legacy_files(b);
  
        b->number = b->secondary = bus;
@@ -2112,7 +2112,7 @@
  
        return b;
  
-@@ -1594,18 +1608,58 @@ err_out:
+@@ -1599,18 +1613,58 @@ err_out:
        return NULL;
  }