Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd

[karo-tx-linux.git] / drivers / pci / pci-sysfs.c

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 9c6e9bb674ec54835d40e09b6c77d0683cd9265d..5b4a9d9cd200dd5a6ee32c3d343bbae0cf2ff8ac 100644 (file)
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -897,7 +897,7 @@ int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vma,
 
        if (pci_resource_len(pdev, resno) == 0)
                return 0;
-       nr = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+       nr = vma_pages(vma);
        start = vma->vm_pgoff;
        size = ((pci_resource_len(pdev, resno) - 1) >> PAGE_SHIFT) + 1;
        pci_start = (mmap_api == PCI_MMAP_PROCFS) ?