Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux.git] / mm / vmalloc.c

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 7ba11e12a11f33b38a007a038bbfc7dee2fe48b3..c1246d77cf753010c6da91329bf2dd00049ef31f 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2993,7 +2993,7 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
        if (!area)
                return -EINVAL;
 
-       if (!(area->flags & VM_USERMAP))
+       if (!(area->flags & (VM_USERMAP | VM_DMA_COHERENT)))
                return -EINVAL;
 
        if (kaddr + size > area->addr + get_vm_area_size(area))
@@ -3496,6 +3496,9 @@ static int s_show(struct seq_file *m, void *p)
        if (v->flags & VM_USERMAP)
                seq_puts(m, " user");
 
+       if (v->flags & VM_DMA_COHERENT)
+               seq_puts(m, " dma-coherent");
+
        if (is_vmalloc_addr(v->pages))
                seq_puts(m, " vpages");