From: Michel Lespinasse Date: Thu, 29 Nov 2012 03:17:22 +0000 (+1100) Subject: linux-next: build warning after merge of the final tree (akpm tree related) X-Git-Tag: next-20121205~1^2~313 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bbde49f5d7a3ee2800da51a96487e5b5d94d147e;p=karo-tx-linux.git linux-next: build warning after merge of the final tree (akpm tree related) On Fri, Nov 09, 2012 at 03:19:03PM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the final tree, today's linux-next build (arm defconfig) > produced this warning: > > arch/arm/mm/mmap.c: In function 'arch_get_unmapped_area': > arch/arm/mm/mmap.c:60:16: warning: unused variable 'start_addr' [-Wunused-variable] > > Introduced by commit "mm: use vm_unmapped_area() on arm architecture". Sorry for the mistakes. The following changes should fix what's been reported so far. commit 1c98949798ce7a1d4a910775623e1830cf88a92c Author: Michel Lespinasse Date: Thu Nov 8 20:26:34 2012 -0800 fix mm: use vm_unmapped_area() on sparc32 architecture index a59bc637f9af..a20b5ab4c701 100644 Signed-off-by: Andrew Morton --- diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index 2a5d61587ca2..a836ee967ecb 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c @@ -89,7 +89,6 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi struct mm_struct *mm = current->mm; struct vm_area_struct * vma; unsigned long task_size = TASK_SIZE; - unsigned long start_addr; int do_color_align; struct vm_unmapped_area_info info; @@ -191,7 +190,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, info.length = len; info.low_limit = PAGE_SIZE; info.high_limit = mm->mmap_base; - info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0; + info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0; info.align_offset = pgoff << PAGE_SHIFT; addr = vm_unmapped_area(&info);