Messages in this thread |  | | | Date | Tue, 16 Nov 2010 11:03:58 +0100 | | From | Martin Wilck <> | | Subject | Re: [REGRESSSION 2.6.37-rc2][PATCH] pci: Fix mmap address check in pci_mmap_fits |
| |
Hi Darrick,
> I think what we want here is for pci_start to be 0 when mmap_api == > PCI_MMAP_PROCFS. The following patch makes that change, after which the Matrox > and Mach64 X drivers work again.
Of course. I made a stupid mistake when I introduced the enum :-( Thanks for spotting and fixing it so quickly.
Jesse, please apply Darrick's fix.
Martin
> diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > index 95712a3..63d5042 100644 > --- a/drivers/pci/pci-sysfs.c > +++ b/drivers/pci/pci-sysfs.c > @@ -715,7 +715,7 @@ int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vma, > nr = (vma->vm_end - vma->vm_start)>> PAGE_SHIFT; > start = vma->vm_pgoff; > size = ((pci_resource_len(pdev, resno) - 1)>> PAGE_SHIFT) + 1; > - pci_start = (mmap_api == PCI_MMAP_SYSFS) ? > + pci_start = (mmap_api == PCI_MMAP_PROCFS) ? > pci_resource_start(pdev, resno)>> PAGE_SHIFT : 0; > if (start>= pci_start&& start< pci_start + size&& > start + nr<= pci_start + size)
-- Dr. Martin Wilck PRIMERGY System Software Engineer x86 Server Engineering
FUJITSU Fujitsu Technology Solutions GmbH Heinz-Nixdorf-Ring 1 33106 Paderborn, Germany Phone: ++49 5251 525 2796 Fax: ++49 5251 525 2820 Email: martin.wilck@ts.fujitsu.com Internet: http://ts.fujitsu.com Company Details: http://ts.fujitsu.com/imprint
|  |