3.4-stable patches

added patches:
	pci-fix-truncation-of-resource-size-to-32-bits.patch

diff --git a/queue-3.4/pci-fix-truncation-of-resource-size-to-32-bits.patch b/queue-3.4/pci-fix-truncation-of-resource-size-to-32-bits.patch
new file mode 100644 (file)
index 0000000..4a7cbe7
--- /dev/null
+++ b/queue-3.4/pci-fix-truncation-of-resource-size-to-32-bits.patch
@@ -0,0 +1,34 @@
+From d6776e6d5c2f8db0252f447b09736075e1bbe387 Mon Sep 17 00:00:00 2001
+From: Nikhil P Rao <nikhil.rao@intel.com>
+Date: Wed, 20 Jun 2012 12:56:00 -0700
+Subject: PCI: fix truncation of resource size to 32 bits
+
+From: Nikhil P Rao <nikhil.rao@intel.com>
+
+commit d6776e6d5c2f8db0252f447b09736075e1bbe387 upstream.
+
+_pci_assign_resource() took an int "size" argument, which meant that
+sizes larger than 4GB were truncated.  Change type to resource_size_t.
+
+[bhelgaas: changelog]
+Signed-off-by: Nikhil P Rao <nikhil.rao@intel.com>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Cc: Jiri Slaby <jslaby@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/pci/setup-res.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/pci/setup-res.c
++++ b/drivers/pci/setup-res.c
+@@ -206,7 +206,8 @@ static int pci_revert_fw_address(struct
+       return ret;
+ }
+ 
+-static int _pci_assign_resource(struct pci_dev *dev, int resno, int size, resource_size_t min_align)
++static int _pci_assign_resource(struct pci_dev *dev, int resno,
++                              resource_size_t size, resource_size_t min_align)
+ {
+       struct resource *res = dev->resource + resno;
+       struct pci_bus *bus;

diff --git a/queue-3.4/series b/queue-3.4/series
index 84a4995a8ba6775d37d424594cf490f831ecae29..411e3cc0cf230ea6889e5d3d88e4fabe4f71028f 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -1,3 +1,4 @@
 cxgb3-fix-length-calculation-in-write_ofld_wr-on-32-bit-architectures.patch
 xen-netback-use-jiffies_64-value-to-calculate-credit-timeout.patch
 net-flow_dissector-fail-on-evil-iph-ihl.patch
+pci-fix-truncation-of-resource-size-to-32-bits.patch