lkml.org 
[lkml]   [2021]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 05/11] x86: mm: Rename __is_kernel_text() to is_x86_32_kernel_text()
    Date
    Commit b56cd05c55a1 ("x86/mm: Rename is_kernel_text to __is_kernel_text"),
    add '__' prefix not to get in conflict with existing is_kernel_text() in
    <linux/kallsyms.h>.

    We will add __is_kernel_text() for the basic kernel text range check in the
    next patch, so use private is_x86_32_kernel_text() naming for x86 special
    check.

    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: x86@kernel.org
    Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
    ---
    arch/x86/mm/init_32.c | 14 +++++---------
    1 file changed, 5 insertions(+), 9 deletions(-)

    diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
    index bd90b8fe81e4..523743ee9dea 100644
    --- a/arch/x86/mm/init_32.c
    +++ b/arch/x86/mm/init_32.c
    @@ -238,11 +238,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
    }
    }

    -/*
    - * The <linux/kallsyms.h> already defines is_kernel_text,
    - * using '__' prefix not to get in conflict.
    - */
    -static inline int __is_kernel_text(unsigned long addr)
    +static inline int is_x86_32_kernel_text(unsigned long addr)
    {
    if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
    return 1;
    @@ -333,8 +329,8 @@ kernel_physical_mapping_init(unsigned long start,
    addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
    PAGE_OFFSET + PAGE_SIZE-1;

    - if (__is_kernel_text(addr) ||
    - __is_kernel_text(addr2))
    + if (is_x86_32_kernel_text(addr) ||
    + is_x86_32_kernel_text(addr2))
    prot = PAGE_KERNEL_LARGE_EXEC;

    pages_2m++;
    @@ -359,7 +355,7 @@ kernel_physical_mapping_init(unsigned long start,
    */
    pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);

    - if (__is_kernel_text(addr))
    + if (is_x86_32_kernel_text(addr))
    prot = PAGE_KERNEL_EXEC;

    pages_4k++;
    @@ -820,7 +816,7 @@ static void mark_nxdata_nx(void)
    */
    unsigned long start = PFN_ALIGN(_etext);
    /*
    - * This comes from __is_kernel_text upper limit. Also HPAGE where used:
    + * This comes from is_x86_32_kernel_text upper limit. Also HPAGE where used:
    */
    unsigned long size = (((unsigned long)__init_end + HPAGE_SIZE) & HPAGE_MASK) - start;

    --
    2.26.2
    \
     
     \ /
      Last update: 2021-09-30 09:10    [W:4.086 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site