diff --git a/[refs] b/[refs] index 1550a688cebf..180e832b5270 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e09d13c4c8805546d97bcc8c508c07f7d8f4c8e8 +refs/heads/master: 3c0b9de6d37a481673e81001c57ca0e410c72346 diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c index 2f3ea749c318..e001768b14e8 100644 --- a/trunk/mm/nommu.c +++ b/trunk/mm/nommu.c @@ -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) {