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

kiryl · Ingo Molnar · commit e8f01a8dad7c · 2017-07-21T10:05:18.000+02:00
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>
diff --git 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
@@ -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
@@ -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
@@ -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
 }
 

Original file line number	Diff line number	Diff line change
`@@ -304,8 +304,8 @@ static inline int mmap_is_ia32(void)`
`304`	`304`	`test_thread_flag(TIF_ADDR32));`
`305`	`305`	`}`
`306`	`306`
`307`		`-extern unsigned long tasksize_32bit(void);`
`308`		`-extern unsigned long tasksize_64bit(void);`
	`307`	`+extern unsigned long task_size_32bit(void);`
	`308`	`+extern unsigned long task_size_64bit(void);`
`309`	`309`	`extern unsigned long get_mmap_base(int is_legacy);`
`310`	`310`
`311`	`311`	`#ifdef CONFIG_X86_32`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`*begin = get_mmap_base(1);`
`123`		`- *end = in_compat_syscall() ? tasksize_32bit() : tasksize_64bit();`
	`123`	`+ *end = in_compat_syscall() ? task_size_32bit() : task_size_64bit();`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`unsigned long`
Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,12 @@ struct va_alignment __read_mostly va_align = {`
`37`	`37`	`.flags = -1,`
`38`	`38`	`};`
`39`	`39`
`40`		`-unsigned long tasksize_32bit(void)`
	`40`	`+unsigned long task_size_32bit(void)`
`41`	`41`	`{`
`42`	`42`	`return IA32_PAGE_OFFSET;`
`43`	`43`	`}`
`44`	`44`
`45`		`-unsigned long tasksize_64bit(void)`
	`45`	`+unsigned long task_size_64bit(void)`
`46`	`46`	`{`
`47`	`47`	`return TASK_SIZE_MAX;`
`48`	`48`	`}`
`@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(unsigned long task_size)`
`52`	`52`	`unsigned long max = 0;`
`53`	`53`	`if ((current->flags & PF_RANDOMIZE) &&`
`54`	`54`	`!(current->personality & ADDR_NO_RANDOMIZE)) {`
`55`		`- max = (-1UL) & __STACK_RND_MASK(task_size == tasksize_32bit());`
	`55`	`+ max = (-1UL) & __STACK_RND_MASK(task_size == task_size_32bit());`
`56`	`56`	`max <<= PAGE_SHIFT;`
`57`	`57`	`}`
`58`	`58`
`@@ -142,7 +142,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm)`
`142`	`142`	`mm->get_unmapped_area = arch_get_unmapped_area_topdown;`
`143`	`143`
`144`	`144`	`arch_pick_mmap_base(&mm->mmap_base, &mm->mmap_legacy_base,`
`145`		`- arch_rnd(mmap64_rnd_bits), tasksize_64bit());`
	`145`	`+ arch_rnd(mmap64_rnd_bits), task_size_64bit());`
`146`	`146`
`147`	`147`	`#ifdef CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES`
`148`	`148`	`/*`
`@@ -152,7 +152,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm)`
`152`	`152`	`* mmap_base, the compat syscall uses mmap_compat_base.`
`153`	`153`	`*/`
`154`	`154`	`arch_pick_mmap_base(&mm->mmap_compat_base, &mm->mmap_compat_legacy_base,`
`155`		`- arch_rnd(mmap32_rnd_bits), tasksize_32bit());`
	`155`	`+ arch_rnd(mmap32_rnd_bits), task_size_32bit());`
`156`	`156`	`#endif`
`157`	`157`	`}`
`158`	`158`