Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7906
b: refs/heads/master
c: 346d388
h: refs/heads/master
v: v3
  • Loading branch information
Michael S. Tsirkin authored and Greg Kroah-Hartman committed Sep 8, 2005
1 parent 278bb69 commit edc6f5c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4352dfd5cd9172f1ee425924a463b43e6157b840
refs/heads/master: 346d38823b59d65c3c1365971776b52e0661b7e5
6 changes: 3 additions & 3 deletions trunk/arch/i386/pci/i386.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit edc6f5c

Please sign in to comment.