From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org ([203.10.76.45]:49664 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992600AbXDDECd (ORCPT ); Wed, 4 Apr 2007 00:02:33 -0400 From: Benjamin Herrenschmidt Date: Wed, 04 Apr 2007 14:02:21 +1000 Subject: [PATCH 13/14] get_unmapped_area handles MAP_FIXED in generic code In-Reply-To: <1175659331.690672.592289266160.qpush@grosgo> Message-Id: <20070404040232.AAF99DDEBB@ozlabs.org> Sender: linux-arch-owner@vger.kernel.org To: Andrew Morton Cc: linux-arch@vger.kernel.org, Linux Memory Management , linux-kernel@vger.kernel.org List-ID: and change the caller now that everybody can handle it. Signed-off-by: Benjamin Herrenschmidt --- mm/mmap.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) Index: linux-cell/mm/mmap.c =================================================================== --- linux-cell.orig/mm/mmap.c 2007-03-22 16:29:22.000000000 +1100 +++ linux-cell/mm/mmap.c 2007-03-22 16:30:06.000000000 +1100 @@ -1199,6 +1199,9 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; + if (flags & MAP_FIXED) + return addr; + if (addr) { addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); @@ -1272,6 +1275,9 @@ arch_get_unmapped_area_topdown(struct fi if (len > TASK_SIZE) return -ENOMEM; + if (flags & MAP_FIXED) + return addr; + /* requesting a specific address */ if (addr) { addr = PAGE_ALIGN(addr); @@ -1360,22 +1366,21 @@ get_unmapped_area(struct file *file, uns unsigned long pgoff, unsigned long flags) { unsigned long ret; + unsigned long (*get_area)(struct file *, unsigned long, + unsigned long, unsigned long, unsigned long); - if (!(flags & MAP_FIXED)) { - unsigned long (*get_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); - - get_area = current->mm->get_unmapped_area; - if (file && file->f_op && file->f_op->get_unmapped_area) - get_area = file->f_op->get_unmapped_area; - addr = get_area(file, addr, len, pgoff, flags); - if (IS_ERR_VALUE(addr)) - return addr; - } + get_area = current->mm->get_unmapped_area; + if (file && file->f_op && file->f_op->get_unmapped_area) + get_area = file->f_op->get_unmapped_area; + addr = get_area(file, addr, len, pgoff, flags); + if (IS_ERR_VALUE(addr)) + return addr; if (addr > TASK_SIZE - len) return -ENOMEM; if (addr & ~PAGE_MASK) return -EINVAL; + if (file && is_file_hugepages(file)) { /* * Check if the given range is hugepage aligned, and