mm-remove-the-prot-argument-to-__vmalloc_node.patch removed from -mm tree
The patch titled
Subject: mm: remove the prot argument to __vmalloc_node
has been removed from the -mm tree. Its filename was
mm-remove-the-prot-argument-to-__vmalloc_node.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 to __vmalloc_node
This is always PAGE_KERNEL now.
---
mm/vmalloc.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-)
mm/vmalloc.c renamed from mm/vmalloc.c~mm-remove-the-prot-argument-to-__vmalloc_node +14 -21
@@ -2402,8 +2402,7 @@ void *vmap(struct page **pages, unsignedEXPORT_SYMBOL (vmap);static void *__vmalloc_node (unsigned long size,unsigned long align, -gfp_t gfp_mask,pgprot_t prot, -int node,const void *caller); +gfp_t gfp_mask,int node,const void *caller);static void *__vmalloc_area_node (struct vm_struct *area,gfp_t gfp_mask,pgprot_t prot,int node) {
@@ -2421,7 +2420,7 @@ static void *__vmalloc_area_node(struct/* Please note that the recursion is strictly bounded. */ if (array_size >PAGE_SIZE ) { pages =__vmalloc_node (array_size,1 , nested_gfp|highmem_mask, -PAGE_KERNEL , node, area->caller); + node, area->caller); }else { pages =kmalloc_node (array_size, nested_gfp, node); }
@@ -2540,13 +2539,11 @@ EXPORT_SYMBOL_GPL(__vmalloc_node_range);* @size: allocation size * @align: desired alignment * @gfp_mask: flags for the page level allocator -* @prot: protection mask for the allocated pages * @node: node to use for allocation or NUMA_NO_NODE * @caller: caller's return address * -* Allocate enough pages to cover @size from the page level -* allocator with @gfp_mask flags. Map them into contiguous -* kernel virtual space, using a pagetable protection of @prot. +* Allocate enough pages to cover @size from the page level allocator with +* @gfp_mask flags. Map them into contiguous kernel virtual space. * * Reclaim modifiers in @gfp_mask - __GFP_NORETRY, __GFP_RETRY_MAYFAIL * and __GFP_NOFAIL are not supported
@@ -2557,16 +2554,15 @@ EXPORT_SYMBOL_GPL(__vmalloc_node_range);* Return: pointer to the allocated memory or %NULL on error */ static void *__vmalloc_node (unsigned long size,unsigned long align, -gfp_t gfp_mask,pgprot_t prot, -int node,const void *caller) +gfp_t gfp_mask,int node,const void *caller) {return __vmalloc_node_range (size, align,VMALLOC_START ,VMALLOC_END , - gfp_mask, prot,0 , node, caller); + gfp_mask,PAGE_KERNEL ,0 , node, caller); }void *__vmalloc (unsigned long size,gfp_t gfp_mask) { -return __vmalloc_node (size,1 , gfp_mask,PAGE_KERNEL ,NUMA_NO_NODE , +return __vmalloc_node (size,1 , gfp_mask,NUMA_NO_NODE ,__builtin_return_address (0 )); }EXPORT_SYMBOL (__vmalloc);
@@ -2574,15 +2570,15 @@ EXPORT_SYMBOL(__vmalloc);static inline void *__vmalloc_node_flags (unsigned long size,int node,gfp_t flags) { -return __vmalloc_node (size,1 , flags,PAGE_KERNEL , - node,__builtin_return_address (0 )); +return __vmalloc_node (size,1 , flags, node, +__builtin_return_address (0 )); }void *__vmalloc_node_flags_caller (unsigned long size,int node,gfp_t flags,void *caller) { -return __vmalloc_node (size,1 , flags,PAGE_KERNEL , node, caller); +return __vmalloc_node (size,1 , flags, node, caller); }/**
@@ -2657,8 +2653,8 @@ EXPORT_SYMBOL(vmalloc_user);*/ void *vmalloc_node (unsigned long size,int node) { -return __vmalloc_node (size,1 ,GFP_KERNEL ,PAGE_KERNEL , - node,__builtin_return_address (0 )); +return __vmalloc_node (size,1 ,GFP_KERNEL , node, +__builtin_return_address (0 )); }EXPORT_SYMBOL (vmalloc_node);
@@ -2671,9 +2667,6 @@ EXPORT_SYMBOL(vmalloc_node);* allocator and map them into contiguous kernel virtual space. * The memory allocated is set to zero. * -* For tight control over page level allocator and protection flags -* use __vmalloc_node() instead. -* * Return: pointer to the allocated memory or %NULL on error */ void *vzalloc_node (unsigned long size,int node)
@@ -2746,8 +2739,8 @@ void *vmalloc_exec(unsigned long size)*/ void *vmalloc_32 (unsigned long size) { -return __vmalloc_node (size,1 ,GFP_VMALLOC32 ,PAGE_KERNEL , -NUMA_NO_NODE ,__builtin_return_address (0 )); +return __vmalloc_node (size,1 ,GFP_VMALLOC32 ,NUMA_NO_NODE , +__builtin_return_address (0 )); }EXPORT_SYMBOL (vmalloc_32);
_
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