From 02b3b812f8d42d7d9da5ce6c9700aa657d4a8dd8 Mon Sep 17 00:00:00 2001 From: Michel Lespinasse Date: Thu, 8 Nov 2012 20:24:53 -0800 Subject: [PATCH] mm-use-vm_unmapped_area-on-sparc64-architecture-fix2 Signed-off-by: Stephen Rothwell --- arch/sparc/kernel/sys_sparc_64.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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); -- 2.39.5