lkml.org 
[lkml]   [2015]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch -mm] mm, vmalloc: remove VM_VPAGES
    VM_VPAGES is unnecessary, it's easier to check is_vmalloc_addr() when
    reading /proc/vmallocinfo.

    Signed-off-by: David Rientjes <rientjes@google.com>
    ---
    include/linux/vmalloc.h | 1 -
    mm/vmalloc.c | 3 +--
    2 files changed, 1 insertion(+), 3 deletions(-)

    diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
    --- a/include/linux/vmalloc.h
    +++ b/include/linux/vmalloc.h
    @@ -14,7 +14,6 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
    #define VM_ALLOC 0x00000002 /* vmalloc() */
    #define VM_MAP 0x00000004 /* vmap()ed pages */
    #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
    -#define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
    #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 */
    diff --git a/mm/vmalloc.c b/mm/vmalloc.c
    --- a/mm/vmalloc.c
    +++ b/mm/vmalloc.c
    @@ -1591,7 +1591,6 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
    if (array_size > PAGE_SIZE) {
    pages = __vmalloc_node(array_size, 1, nested_gfp|__GFP_HIGHMEM,
    PAGE_KERNEL, node, area->caller);
    - area->flags |= VM_VPAGES;
    } else {
    pages = kmalloc_node(array_size, nested_gfp, node);
    }
    @@ -2649,7 +2648,7 @@ static int s_show(struct seq_file *m, void *p)
    if (v->flags & VM_USERMAP)
    seq_puts(m, " user");

    - if (v->flags & VM_VPAGES)
    + if (is_vmalloc_addr(v->pages))
    seq_puts(m, " vpages");

    show_numa_info(m, v);

    \
     
     \ /
      Last update: 2015-11-19 01:41    [W:2.871 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site