openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/mm: Rename tasksize_32bit/64bit to task_size_32bit/64bit() 

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>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arch@vger.kernel.org
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20170716225954.74185-5-kirill.shutemov@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Kirill A. Shutemov 2017-07-17 01:59:50 +03:00 committed by Ingo Molnar
parent daaa42f041
commit e8f01a8dad
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/include/asm/elf.h
View File

@ -304,8 +304,8 @@ static inline int mmap_is_ia32(void)
test_thread_flag(TIF_ADDR32)); test_thread_flag(TIF_ADDR32));
} }
extern unsigned long tasksize_32bit(void); extern unsigned long task_size_32bit(void);
extern unsigned long tasksize_64bit(void); extern unsigned long task_size_64bit(void);
extern unsigned long get_mmap_base(int is_legacy); extern unsigned long get_mmap_base(int is_legacy);
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32

2
arch/x86/kernel/sys_x86_64.c
View File

@ -120,7 +120,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
} }
*begin = get_mmap_base(1); *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 unsigned long

2
arch/x86/mm/hugetlbpage.c
View File

@ -86,7 +86,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
info.length = len; info.length = len;
info.low_limit = get_mmap_base(1); info.low_limit = get_mmap_base(1);
info.high_limit = in_compat_syscall() ? 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_mask = PAGE_MASK & ~huge_page_mask(h);
info.align_offset = 0; info.align_offset = 0;
return vm_unmapped_area(&info); return vm_unmapped_area(&info);

10
arch/x86/mm/mmap.c
View File

@ -37,12 +37,12 @@ struct va_alignment __read_mostly va_align = {
.flags = -1, .flags = -1,
}; };
unsigned long tasksize_32bit(void) unsigned long task_size_32bit(void)
{ {
return IA32_PAGE_OFFSET; return IA32_PAGE_OFFSET;
} }
unsigned long tasksize_64bit(void) unsigned long task_size_64bit(void)
{ {
return TASK_SIZE_MAX; return TASK_SIZE_MAX;
} }
@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(unsigned long task_size)
unsigned long max = 0; unsigned long max = 0;
if ((current->flags & PF_RANDOMIZE) && if ((current->flags & PF_RANDOMIZE) &&
!(current->personality & ADDR_NO_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; 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; mm->get_unmapped_area = arch_get_unmapped_area_topdown;
arch_pick_mmap_base(&mm->mmap_base, &mm->mmap_legacy_base, 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 #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. * mmap_base, the compat syscall uses mmap_compat_base.
*/ */
arch_pick_mmap_base(&mm->mmap_compat_base, &mm->mmap_compat_legacy_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 #endif
} }