mm-remove-the-prot-argument-from-vm_map_ram.patch removed from -mm tree
The patch titled
Subject: mm: remove the prot argument from vm_map_ram
has been removed from the -mm tree. Its filename was
mm-remove-the-prot-argument-from-vm_map_ram.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: 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.
---
drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 2 +- drivers/media/common/videobuf2/videobuf2-dma-sg.c | 3 +-- drivers/media/common/videobuf2/videobuf2-vmalloc.c | 3 +-- fs/erofs/decompressor.c | 2 +- fs/xfs/xfs_buf.c | 2 +- include/linux/vmalloc.h | 3 +-- mm/nommu.c | 2 +- mm/vmalloc.c | 4 ++-- 8 files changed, 9 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c renamed from drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c~mm-remove-the-prot-argument-from-vm_map_ram +1 -1
@@ -66,7 +66,7 @@ static void *mock_dmabuf_vmap(struct dma {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 renamed from drivers/media/common/videobuf2/videobuf2-dma-sg.c~mm-remove-the-prot-argument-from-vm_map_ram +1 -2
@@ -309,8 +309,7 @@ static void *vb2_dma_sg_vaddr(void *buf_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 renamed from drivers/media/common/videobuf2/videobuf2-vmalloc.c~mm-remove-the-prot-argument-from-vm_map_ram +1 -2
@@ -107,8 +107,7 @@ static void *vb2_vmalloc_get_userptr(str 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 renamed from fs/erofs/decompressor.c~mm-remove-the-prot-argument-from-vm_map_ram +1 -1
@@ -274,7 +274,7 @@ static int z_erofs_decompress_generic(st 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 renamed from fs/xfs/xfs_buf.c~mm-remove-the-prot-argument-from-vm_map_ram +1 -1
@@ -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();
include/linux/vmalloc.h renamed from include/linux/vmalloc.h~mm-remove-the-prot-argument-from-vm_map_ram +1 -2
@@ -88,8 +88,7 @@ struct vmap_area {* Highlevel APIs for driver use */ extern void vm_unmap_ram (const void *mem,unsigned int count); -extern void *vm_map_ram (struct page **pages,unsigned int count, -int node,pgprot_t prot); +extern void *vm_map_ram (struct page **pages,unsigned int count,int node);extern void vm_unmap_aliases (void );#ifdef CONFIG_MMU
mm/nommu.c renamed from mm/nommu.c~mm-remove-the-prot-argument-from-vm_map_ram +1 -1
@@ -351,7 +351,7 @@ void vunmap(const void *addr) }EXPORT_SYMBOL (vunmap); -void *vm_map_ram (struct page **pages,unsigned int count,int node,pgprot_t prot) +void *vm_map_ram (struct page **pages,unsigned int count,int node) {BUG ();return NULL ;
mm/vmalloc.c renamed from mm/vmalloc.c~mm-remove-the-prot-argument-from-vm_map_ram +2 -2
@@ -1835,7 +1835,7 @@ EXPORT_SYMBOL(vm_unmap_ram);* * Returns: a pointer to the address that has been mapped, or %NULL on failure */ -void *vm_map_ram (struct page **pages,unsigned int count,int node,pgprot_t prot) +void *vm_map_ram (struct page **pages,unsigned int count,int node) {unsigned long size = (unsigned long )count <<PAGE_SHIFT ;unsigned long addr;
@@ -1859,7 +1859,7 @@ void *vm_map_ram(struct page **pages, unkasan_unpoison_vmalloc (mem, size); -if (map_kernel_range (addr, size, prot, pages) <0 ) { +if (map_kernel_range (addr, size,PAGE_KERNEL , pages) <0 ) {vm_unmap_ram (mem, count);return NULL ; }
_
Patches currently in -mm which might be from [email protected] are
exec-simplify-the-copy_strings_kernel-calling-convention.patch exec-open-code-copy_string_kernel.patch amdgpu-a-null-mm-does-not-mean-a-thread-is-a-kthread.patch kernel-move-use_mm-unuse_mm-to-kthreadc.patch kernel-move-use_mm-unuse_mm-to-kthreadc-v2.patch kernel-better-document-the-use_mm-unuse_mm-api-contract.patch kernel-better-document-the-use_mm-unuse_mm-api-contract-v2.patch kernel-set-user_ds-in-kthread_use_mm.patch arm-fix-the-flush_icache_range-arguments-in-set_fiq_handler.patch nds32-unexport-flush_icache_page.patch powerpc-unexport-flush_icache_user_range.patch unicore32-remove-flush_cache_user_range.patch asm-generic-fix-the-inclusion-guards-for-cacheflushh.patch asm-generic-dont-include-linux-mmh-in-cacheflushh.patch asm-generic-dont-include-linux-mmh-in-cacheflushh-fix.patch asm-generic-improve-the-flush_dcache_page-stub.patch alpha-use-asm-generic-cacheflushh.patch arm64-use-asm-generic-cacheflushh.patch c6x-use-asm-generic-cacheflushh.patch hexagon-use-asm-generic-cacheflushh.patch ia64-use-asm-generic-cacheflushh.patch microblaze-use-asm-generic-cacheflushh.patch m68knommu-use-asm-generic-cacheflushh.patch openrisc-use-asm-generic-cacheflushh.patch powerpc-use-asm-generic-cacheflushh.patch riscv-use-asm-generic-cacheflushh.patch armsparcunicore32-remove-flush_icache_user_range.patch mm-rename-flush_icache_user_range-to-flush_icache_user_page.patch asm-generic-add-a-flush_icache_user_range-stub.patch sh-implement-flush_icache_user_range.patch xtensa-implement-flush_icache_user_range.patch arm-rename-flush_cache_user_range-to-flush_icache_user_range.patch m68k-implement-flush_icache_user_range.patch exec-only-build-read_code-when-needed.patch exec-use-flush_icache_user_range-in-read_code.patch binfmt_flat-use-flush_icache_user_range.patch nommu-use-flush_icache_user_range-in-brk-and-mmap.patch module-move-the-set_fs-hack-for-flush_icache_range-to-m68k.patch maccess-unexport-probe_kernel_write-and-probe_user_write.patch maccess-remove-various-unused-weak-aliases.patch maccess-remove-duplicate-kerneldoc-comments.patch maccess-clarify-kerneldoc-comments.patch maccess-update-the-top-of-file-comment.patch maccess-rename-strncpy_from_unsafe_user-to-strncpy_from_user_nofault.patch maccess-rename-strncpy_from_unsafe_strict-to-strncpy_from_kernel_nofault.patch maccess-rename-strnlen_unsafe_user-to-strnlen_user_nofault.patch maccess-remove-probe_read_common-and-probe_write_common.patch maccess-unify-the-probe-kernel-arch-hooks.patch bpf-factor-out-a-bpf_trace_copy_string-helper.patch bpf-handle-the-compat-string-in-bpf_trace_copy_string-better.patch bpf-rework-the-compat-kernel-probe-handling.patch tracing-kprobes-handle-mixed-kernel-userspace-probes-better.patch maccess-remove-strncpy_from_unsafe.patch maccess-always-use-strict-semantics-for-probe_kernel_read.patch maccess-move-user-access-routines-together.patch maccess-allow-architectures-to-provide-kernel-probing-directly.patch x86-use-non-set_fs-based-maccess-routines.patch maccess-return-erange-when-copy_from_kernel_nofault_allowed-fails.patch