lkml.org 
[lkml]   [2017]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/8] x86/mm: Rename tasksize_32bit/64bit to task_size_32bit/64bit
    Date
    Rename these helpers to be consistent with spelling of TASK_SIZE and
    related constants.

    Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
    ---
    arch/x86/include/asm/elf.h | 4 ++--
    arch/x86/kernel/sys_x86_64.c | 2 +-
    arch/x86/mm/hugetlbpage.c | 2 +-
    arch/x86/mm/mmap.c | 10 +++++-----
    4 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
    index 1c18d83d3f09..c7090ef1388e 100644
    --- a/arch/x86/include/asm/elf.h
    +++ b/arch/x86/include/asm/elf.h
    @@ -304,8 +304,8 @@ static inline int mmap_is_ia32(void)
    test_thread_flag(TIF_ADDR32));
    }

    -extern unsigned long tasksize_32bit(void);
    -extern unsigned long tasksize_64bit(void);
    +extern unsigned long task_size_32bit(void);
    +extern unsigned long task_size_64bit(void);
    extern unsigned long get_mmap_base(int is_legacy);

    #ifdef CONFIG_X86_32
    diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
    index 213ddf3e937d..89bd0d6460e1 100644
    --- a/arch/x86/kernel/sys_x86_64.c
    +++ b/arch/x86/kernel/sys_x86_64.c
    @@ -120,7 +120,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
    }

    *begin = get_mmap_base(1);
    - *end = in_compat_syscall() ? tasksize_32bit() : tasksize_64bit();
    + *end = in_compat_syscall() ? task_size_32bit() : task_size_64bit();
    }

    unsigned long
    diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
    index 2824607df108..868f02cf58ce 100644
    --- a/arch/x86/mm/hugetlbpage.c
    +++ b/arch/x86/mm/hugetlbpage.c
    @@ -86,7 +86,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
    info.length = len;
    info.low_limit = get_mmap_base(1);
    info.high_limit = in_compat_syscall() ?
    - tasksize_32bit() : tasksize_64bit();
    + task_size_32bit() : task_size_64bit();
    info.align_mask = PAGE_MASK & ~huge_page_mask(h);
    info.align_offset = 0;
    return vm_unmapped_area(&info);
    diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
    index 229d04a83f85..d2586913c8d0 100644
    --- a/arch/x86/mm/mmap.c
    +++ b/arch/x86/mm/mmap.c
    @@ -37,12 +37,12 @@ struct va_alignment __read_mostly va_align = {
    .flags = -1,
    };

    -unsigned long tasksize_32bit(void)
    +unsigned long task_size_32bit(void)
    {
    return IA32_PAGE_OFFSET;
    }

    -unsigned long tasksize_64bit(void)
    +unsigned long task_size_64bit(void)
    {
    return TASK_SIZE_MAX;
    }
    @@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(unsigned long task_size)
    unsigned long max = 0;
    if ((current->flags & PF_RANDOMIZE) &&
    !(current->personality & ADDR_NO_RANDOMIZE)) {
    - max = (-1UL) & __STACK_RND_MASK(task_size == tasksize_32bit());
    + max = (-1UL) & __STACK_RND_MASK(task_size == task_size_32bit());
    max <<= PAGE_SHIFT;
    }

    @@ -142,7 +142,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
    mm->get_unmapped_area = arch_get_unmapped_area_topdown;

    arch_pick_mmap_base(&mm->mmap_base, &mm->mmap_legacy_base,
    - arch_rnd(mmap64_rnd_bits), tasksize_64bit());
    + arch_rnd(mmap64_rnd_bits), task_size_64bit());

    #ifdef CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES
    /*
    @@ -152,7 +152,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
    * mmap_base, the compat syscall uses mmap_compat_base.
    */
    arch_pick_mmap_base(&mm->mmap_compat_base, &mm->mmap_compat_legacy_base,
    - arch_rnd(mmap32_rnd_bits), tasksize_32bit());
    + arch_rnd(mmap32_rnd_bits), task_size_32bit());
    #endif
    }

    --
    2.11.0
    \
     
     \ /
      Last update: 2017-07-17 01:01    [W:5.031 / U:0.728 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site