lkml.org 
[lkml]   [2020]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/29] mm: rename CONFIG_PGTABLE_MAPPING to CONFIG_ZSMALLOC_PGTABLE_MAPPING
    Date
    Rename the Kconfig variable to clarify the scope.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Acked-by: Minchan Kim <minchan@kernel.org>
    Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    ---
    arch/arm/configs/omap2plus_defconfig | 2 +-
    include/linux/zsmalloc.h | 2 +-
    mm/Kconfig | 2 +-
    mm/zsmalloc.c | 8 ++++----
    4 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
    index 3cc3ca5fa027..583d8abd80a4 100644
    --- a/arch/arm/configs/omap2plus_defconfig
    +++ b/arch/arm/configs/omap2plus_defconfig
    @@ -81,7 +81,7 @@ CONFIG_PARTITION_ADVANCED=y
    CONFIG_BINFMT_MISC=y
    CONFIG_CMA=y
    CONFIG_ZSMALLOC=m
    -CONFIG_PGTABLE_MAPPING=y
    +CONFIG_ZSMALLOC_PGTABLE_MAPPING=y
    CONFIG_NET=y
    CONFIG_PACKET=y
    CONFIG_UNIX=y
    diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h
    index 2219cce81ca4..0fdbf653b173 100644
    --- a/include/linux/zsmalloc.h
    +++ b/include/linux/zsmalloc.h
    @@ -20,7 +20,7 @@
    * zsmalloc mapping modes
    *
    * NOTE: These only make a difference when a mapped object spans pages.
    - * They also have no effect when PGTABLE_MAPPING is selected.
    + * They also have no effect when ZSMALLOC_PGTABLE_MAPPING is selected.
    */
    enum zs_mapmode {
    ZS_MM_RW, /* normal read-write mapping */
    diff --git a/mm/Kconfig b/mm/Kconfig
    index c1acc34c1c35..09a9edfb8461 100644
    --- a/mm/Kconfig
    +++ b/mm/Kconfig
    @@ -705,7 +705,7 @@ config ZSMALLOC
    returned by an alloc(). This handle must be mapped in order to
    access the allocated space.

    -config PGTABLE_MAPPING
    +config ZSMALLOC_PGTABLE_MAPPING
    bool "Use page table mapping to access object in zsmalloc"
    depends on ZSMALLOC
    help
    diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
    index 2f836a2b993f..ac0524330b9b 100644
    --- a/mm/zsmalloc.c
    +++ b/mm/zsmalloc.c
    @@ -293,7 +293,7 @@ struct zspage {
    };

    struct mapping_area {
    -#ifdef CONFIG_PGTABLE_MAPPING
    +#ifdef CONFIG_ZSMALLOC_PGTABLE_MAPPING
    struct vm_struct *vm; /* vm area for mapping object that span pages */
    #else
    char *vm_buf; /* copy buffer for objects that span pages */
    @@ -1113,7 +1113,7 @@ static struct zspage *find_get_zspage(struct size_class *class)
    return zspage;
    }

    -#ifdef CONFIG_PGTABLE_MAPPING
    +#ifdef CONFIG_ZSMALLOC_PGTABLE_MAPPING
    static inline int __zs_cpu_up(struct mapping_area *area)
    {
    /*
    @@ -1151,7 +1151,7 @@ static inline void __zs_unmap_object(struct mapping_area *area,
    unmap_kernel_range(addr, PAGE_SIZE * 2);
    }

    -#else /* CONFIG_PGTABLE_MAPPING */
    +#else /* CONFIG_ZSMALLOC_PGTABLE_MAPPING */

    static inline int __zs_cpu_up(struct mapping_area *area)
    {
    @@ -1233,7 +1233,7 @@ static void __zs_unmap_object(struct mapping_area *area,
    pagefault_enable();
    }

    -#endif /* CONFIG_PGTABLE_MAPPING */
    +#endif /* CONFIG_ZSMALLOC_PGTABLE_MAPPING */

    static int zs_cpu_prepare(unsigned int cpu)
    {
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-04-14 15:16    [W:4.179 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site