linux-kernel - Re: linux-next: build warning after merge of the final tree (akpm tree related)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Mon, 12 Nov 2012 10:49:46 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Michel Lespinasse <walken@...gle.com>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rik van Riel <riel@...hat.com>
Subject: Re: linux-next: build warning after merge of the final tree (akpm
 tree related)

Hi Michel,

On Thu, 8 Nov 2012 20:30:47 -0800 Michel Lespinasse <walken@...gle.com> wrote:
>
> commit 1c98949798ce7a1d4a910775623e1830cf88a92c
> Author: Michel Lespinasse <walken@...gle.com>
> Date:   Thu Nov 8 20:26:34 2012 -0800
> 
>     fix mm: use vm_unmapped_area() on sparc32 architecture
> 
> diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
> index a59bc637f9af..a20b5ab4c701 100644
> --- a/arch/sparc/kernel/sys_sparc_32.c
> +++ b/arch/sparc/kernel/sys_sparc_32.c
> @@ -38,7 +38,6 @@ asmlinkage unsigned long sys_getpagesize(void)
>  
>  unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags)
>  {
> -	struct vm_area_struct * vmm;
>  	struct vm_unmapped_area_info info;
>  
>  	if (flags & MAP_FIXED) {
> 
> commit aa96ebbc9ec664ddafc841f7631c4a092b10c0d8
> Author: Michel Lespinasse <walken@...gle.com>
> Date:   Thu Nov 8 20:25:48 2012 -0800
> 
>     fix mm: use vm_unmapped_area() in hugetlbfs on sparc64 architecture
> 
> diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
> index 42e5dba6cb26..d2b59441ebdd 100644
> --- a/arch/sparc/mm/hugetlbpage.c
> +++ b/arch/sparc/mm/hugetlbpage.c
> @@ -60,7 +60,6 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
>  				  const unsigned long pgoff,
>  				  const unsigned long flags)
>  {
> -	struct vm_area_struct *vma;
>  	struct mm_struct *mm = current->mm;
>  	unsigned long addr = addr0;
>  	struct vm_unmapped_area_info info;
> 
> commit ff4dd9742ce0a5f7c703013e70eeb84b845c8fa2
> Author: Michel Lespinasse <walken@...gle.com>
> Date:   Thu Nov 8 20:24:53 2012 -0800
> 
>     mm-use-vm_unmapped_area-on-sparc64-architecture-fix2
> 
> 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);
>  
> 
> commit ed558f3723a4ac2fb71d6c8fc70116994af6e61d
> Author: Michel Lespinasse <walken@...gle.com>
> Date:   Thu Nov 8 20:22:36 2012 -0800
> 
>     mm-use-vm_unmapped_area-on-arm-architecture-fix2
> 
> diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
> index f4fec6d43d50..10062ceadd1c 100644
> --- a/arch/arm/mm/mmap.c
> +++ b/arch/arm/mm/mmap.c
> @@ -57,7 +57,6 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
>  {
>  	struct mm_struct *mm = current->mm;
>  	struct vm_area_struct *vma;
> -	unsigned long start_addr;
>  	int do_align = 0;
>  	int aliasing = cache_is_vipt_aliasing();
>  	struct vm_unmapped_area_info info;
> 

All added to the akpm tree today.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped