lkml.org 
[lkml]   [2018]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND PATCH v6 2/4] mm: move is_kernel_rodata() to asm-generic/sections.h
    Date
    Export this routine so that we can use it later in devm_kstrdup_const()
    and devm_kfree().

    Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
    Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Acked-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
    Acked-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
    Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    include/asm-generic/sections.h | 14 ++++++++++++++
    mm/util.c | 7 -------
    2 files changed, 14 insertions(+), 7 deletions(-)

    diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h
    index 849cd8eb5ca0..d79abca81a52 100644
    --- a/include/asm-generic/sections.h
    +++ b/include/asm-generic/sections.h
    @@ -141,4 +141,18 @@ static inline bool init_section_intersects(void *virt, size_t size)
    return memory_intersects(__init_begin, __init_end, virt, size);
    }

    +/**
    + * is_kernel_rodata - checks if the pointer address is located in the
    + * .rodata section
    + *
    + * @addr: address to check
    + *
    + * Returns: true if the address is located in .rodata, false otherwise.
    + */
    +static inline bool is_kernel_rodata(unsigned long addr)
    +{
    + return addr >= (unsigned long)__start_rodata &&
    + addr < (unsigned long)__end_rodata;
    +}
    +
    #endif /* _ASM_GENERIC_SECTIONS_H_ */
    diff --git a/mm/util.c b/mm/util.c
    index 9e3ebd2ef65f..470f5cd80b64 100644
    --- a/mm/util.c
    +++ b/mm/util.c
    @@ -15,17 +15,10 @@
    #include <linux/vmalloc.h>
    #include <linux/userfaultfd_k.h>

    -#include <asm/sections.h>
    #include <linux/uaccess.h>

    #include "internal.h"

    -static inline int is_kernel_rodata(unsigned long addr)
    -{
    - return addr >= (unsigned long)__start_rodata &&
    - addr < (unsigned long)__end_rodata;
    -}
    -
    /**
    * kfree_const - conditionally free memory
    * @x: pointer to the memory
    --
    2.19.1
    \
     
     \ /
      Last update: 2018-10-14 17:21    [W:2.642 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site