mm-remove-both-instances-of-__vmalloc_node_flags.patch removed from -mm tree
The patch titled
Subject: mm: remove both instances of __vmalloc_node_flags
has been removed from the -mm tree. Its filename was
mm-remove-both-instances-of-__vmalloc_node_flags.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: mm: remove both instances of __vmalloc_node_flags
The real version just had a few callers that can open code it and remove one layer of indirection. The nommu stub was public but only had a single caller, so remove it and avoid a CONFIG_MMU ifdef in vmalloc.h.
---
include/linux/vmalloc.h | 9 --------- mm/nommu.c | 3 ++- mm/vmalloc.c | 20 ++++++-------------- 3 files changed, 8 insertions(+), 24 deletions(-)
include/linux/vmalloc.h renamed from include/linux/vmalloc.h~mm-remove-both-instances-of-__vmalloc_node_flags +0 -9
@@ -115,17 +115,8 @@ extern void *__vmalloc_node_range(unsign unsigned long start, unsigned long end, gfp_t gfp_mask, pgprot_t prot, unsigned long vm_flags, int node, const void *caller); -#ifndef CONFIG_MMU -extern void *__vmalloc_node_flags (unsigned long size,int node,gfp_t flags); -static inline void *__vmalloc_node_flags_caller (unsigned long size,int node, -gfp_t flags,void *caller) -{ -return __vmalloc_node_flags (size, node, flags); -} -#else extern void *__vmalloc_node_flags_caller (unsigned long size,int node,gfp_t flags,void *caller); -#endif extern void vfree (const void *addr);extern void vfree_atomic (const void *addr);
mm/nommu.c renamed from mm/nommu.c~mm-remove-both-instances-of-__vmalloc_node_flags +2 -1
@@ -150,7 +150,8 @@ void *__vmalloc(unsigned long size, gfp_ }EXPORT_SYMBOL (__vmalloc); -void *__vmalloc_node_flags (unsigned long size,int node,gfp_t flags) +void *__vmalloc_node_flags_caller (unsigned long size,int node,gfp_t flags, +void *caller) {return __vmalloc (size, flags); }
mm/vmalloc.c renamed from mm/vmalloc.c~mm-remove-both-instances-of-__vmalloc_node_flags +6 -14
@@ -2567,14 +2567,6 @@ void *__vmalloc(unsigned long size, gfp_ }EXPORT_SYMBOL (__vmalloc); -static inline void *__vmalloc_node_flags (unsigned long size, -int node,gfp_t flags) -{ -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) {
@@ -2595,8 +2587,8 @@ void *__vmalloc_node_flags_caller(unsign*/ void *vmalloc (unsigned long size) { -return __vmalloc_node_flags (size,NUMA_NO_NODE , -GFP_KERNEL ); +return __vmalloc_node (size,1 ,GFP_KERNEL ,NUMA_NO_NODE , +__builtin_return_address (0 )); }EXPORT_SYMBOL (vmalloc);
@@ -2615,8 +2607,8 @@ EXPORT_SYMBOL(vmalloc);*/ void *vzalloc (unsigned long size) { -return __vmalloc_node_flags (size,NUMA_NO_NODE , -GFP_KERNEL | __GFP_ZERO); +return __vmalloc_node (size,1 ,GFP_KERNEL | __GFP_ZERO,NUMA_NO_NODE , +__builtin_return_address (0 )); }EXPORT_SYMBOL (vzalloc);
@@ -2671,8 +2663,8 @@ EXPORT_SYMBOL(vmalloc_node);*/ void *vzalloc_node (unsigned long size,int node) { -return __vmalloc_node_flags (size, node, -GFP_KERNEL | __GFP_ZERO); +return __vmalloc_node (size,1 ,GFP_KERNEL | __GFP_ZERO, node, +__builtin_return_address (0 )); }EXPORT_SYMBOL (vzalloc_node);
_
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