Commit d4efd79a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

mm: remove the prot argument from vm_map_ram 



This is always PAGE_KERNEL - for long term mappings with other properties
vmap should be used.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>
Cc: Gao Xiang <xiang@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Kelley <mikelley@microsoft.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Wei Liu <wei.liu@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Link: http://lkml.kernel.org/r/20200414131348.444715-19-hch@lst.de


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 855e57a1

drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void *mock_dmabuf_vmap(struct dma_buf *dma_buf) 
{

	struct mock_dmabuf *mock = to_mock(dma_buf);



	return vm_map_ram(mock->pages, mock->npages, 0, PAGE_KERNEL);

	return vm_map_ram(mock->pages, mock->npages, 0);

}



static void mock_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr)

drivers/media/common/videobuf2/videobuf2-dma-sg.c

+1 −2
Original line number Diff line number Diff line
@@ -309,8 +309,7 @@ static void *vb2_dma_sg_vaddr(void *buf_priv) 
		if (buf->db_attach)

			buf->vaddr = dma_buf_vmap(buf->db_attach->dmabuf);

		else

			buf->vaddr = vm_map_ram(buf->pages,

					buf->num_pages, -1, PAGE_KERNEL);

			buf->vaddr = vm_map_ram(buf->pages, buf->num_pages, -1);

	}



	/* add offset in case userptr is not page-aligned */

drivers/media/common/videobuf2/videobuf2-vmalloc.c

+1 −2
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ static void *vb2_vmalloc_get_userptr(struct device *dev, unsigned long vaddr, 
		buf->vaddr = (__force void *)

			ioremap(__pfn_to_phys(nums[0]), size + offset);

	} else {

		buf->vaddr = vm_map_ram(frame_vector_pages(vec), n_pages, -1,

					PAGE_KERNEL);

		buf->vaddr = vm_map_ram(frame_vector_pages(vec), n_pages, -1);

	}



	if (!buf->vaddr)

fs/erofs/decompressor.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static int z_erofs_decompress_generic(struct z_erofs_decompress_req *rq, 


	i = 0;

	while (1) {

		dst = vm_map_ram(rq->out, nrpages_out, -1, PAGE_KERNEL);

		dst = vm_map_ram(rq->out, nrpages_out, -1);



		/* retry two more times (totally 3 times) */

		if (dst || ++i >= 3)

fs/xfs/xfs_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ _xfs_buf_map_pages( 
		nofs_flag = memalloc_nofs_save();

		do {

			bp->b_addr = vm_map_ram(bp->b_pages, bp->b_page_count,

						-1, PAGE_KERNEL);

						-1);

			if (bp->b_addr)

				break;

			vm_unmap_aliases();

CRA Git | Maintained and supported by SUSTech CRA and CCSE