@@ -23,9 +23,6 @@ struct notifier_block; /* in notifier.h
#define VM_DMA_COHERENT 0x00000010 /* dma_alloc_coherent */
#define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
#define VM_NO_GUARD 0x00000040 /* don't add guard page */
-#define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
-#define VM_MAP_PUT_PAGES 0x00000100 /* put pages and free array in vfree */
-
/*
* VM_KASAN is used slighly differently depending on CONFIG_KASAN_VMALLOC.
*
@@ -36,12 +33,13 @@ struct notifier_block; /* in notifier.h
* Otherwise, VM_KASAN is set for kasan_module_alloc() allocations and used to
* determine which allocations need the module shadow freed.
*/
-
+#define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
/*
* Memory with VM_FLUSH_RESET_PERMS cannot be freed in an interrupt or with
* vfree_atomic().
*/
#define VM_FLUSH_RESET_PERMS 0x00000100 /* Reset direct map and flush TLB on unmap */
+#define VM_MAP_PUT_PAGES 0x00000200 /* put pages and free array in vfree */
/* bits [20..32] reserved for arch specific ioremap internals */
The patch titled Subject: mm/vmalloc: reparate put pages and flush VM flags has been removed from the -mm tree. Its filename was mm-vmalloc-separate-put-pages-and-flush-vm-flags.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Rick Edgecombe <rick.p.edgecombe@intel.com> Subject: mm/vmalloc: reparate put pages and flush VM flags When VM_MAP_PUT_PAGES was added, it was defined with the same value as VM_FLUSH_RESET_PERMS. This doesn't seem like it will cause any big functional problems other than some excess flushing for VM_MAP_PUT_PAGES allocations. Redefine VM_MAP_PUT_PAGES to have its own value. Also, move the comment and remove whitespace for VM_KASAN such that the flags lower down are less likely to be missed in the future. Link: https://lkml.kernel.org/r/20210121014118.31922-1-rick.p.edgecombe@intel.com Fixes: b944afc9d64d ("mm: add a VM_MAP_PUT_PAGES flag for vmap") Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Cc: Daniel Axtens <dja@axtens.net> Cc: Matthew Wilcox <willy@infradead.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- include/linux/vmalloc.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)