diff --git a/[refs] b/[refs] index f5f99b2608aa..ca6254160174 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4352dfd5cd9172f1ee425924a463b43e6157b840 +refs/heads/master: 346d38823b59d65c3c1365971776b52e0661b7e5 diff --git a/trunk/arch/i386/pci/i386.c b/trunk/arch/i386/pci/i386.c index 3cc480998a47..6d6338500c3c 100644 --- a/trunk/arch/i386/pci/i386.c +++ b/trunk/arch/i386/pci/i386.c @@ -283,9 +283,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, /* Write-combine setting is ignored, it is changed via the mtrr * interfaces on this platform. */ - if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, - vma->vm_end - vma->vm_start, - vma->vm_page_prot)) + if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, + vma->vm_end - vma->vm_start, + vma->vm_page_prot)) return -EAGAIN; return 0;