Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 362744
b: refs/heads/master
c: 3c0b9de
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed Apr 27, 2013
1 parent f1a0e4f commit 8a7459b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e09d13c4c8805546d97bcc8c508c07f7d8f4c8e8
refs/heads/master: 3c0b9de6d37a481673e81001c57ca0e410c72346
10 changes: 10 additions & 0 deletions trunk/mm/nommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1838,6 +1838,16 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
}
EXPORT_SYMBOL(remap_pfn_range);

int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len)
{
unsigned long pfn = start >> PAGE_SHIFT;
unsigned long vm_len = vma->vm_end - vma->vm_start;

pfn += vma->vm_pgoff;
return io_remap_pfn_range(vma, vma->vm_start, pfn, vm_len, vma->vm_page_prot);
}
EXPORT_SYMBOL(vm_iomap_memory);

int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
unsigned long pgoff)
{
Expand Down

0 comments on commit 8a7459b

Please sign in to comment.