aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikhil P Rao <nikhil.rao@intel.com>2012-06-20 12:56:00 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-20 10:43:18 -0800
commitc10141099c1ea42afa3ded64530cf285d8ffc96a (patch)
tree3ecf78bc947f72c19ea04e13e696aa424a37ddcf
parent161f4a458cd88dc6ab33078d64aa28315129fade (diff)
PCI: fix truncation of resource size to 32 bits
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>
-rw-r--r--drivers/pci/setup-res.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index eea85dafc763..be76ebacf486 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -206,7 +206,8 @@ static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev,
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;