From patchwork Mon Nov 5 22:47:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 197342 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0079F2C00A8 for ; Tue, 6 Nov 2012 09:48:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754989Ab2KEWsA (ORCPT ); Mon, 5 Nov 2012 17:48:00 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:56510 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964810Ab2KEWr5 (ORCPT ); Mon, 5 Nov 2012 17:47:57 -0500 Received: by mail-pb0-f46.google.com with SMTP id rr4so4250708pbb.19 for ; Mon, 05 Nov 2012 14:47:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=1bdZJOJFyYYe3TNi395CJvw+NxzxEeeJWLV7JAFL6Og=; b=AIjPq8XYet9dz58VUHqEj8ODrvi2kBJdwDm82I+kl5Op6Z5XoxIHFhhjVjERTM/fmZ NHemXX1nz7aDbEmv8TpswcOVQ9FvnlTn32JxPDBG23A2ArdZwJiQdhUKuM6riTse8vq1 LJUPU7mfigQbkCjzPnEZf4EADOo2OGXJ4dnRbQLH3t+A8nHBbtCOr4YZ/eBgfuEeAAFc DevtFLiCw+KlzGbTZ7IQnwO+gwGX1J0+n75aQw/B7MX337dy8TLBw03RhFezM8PurhcY sspM+kO0FddD0VZxIwh/wS3A9nKyjcGt1FAfLWQ64b5B9Sx0sgmeeth/li/oG3HX3jaW HpzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=1bdZJOJFyYYe3TNi395CJvw+NxzxEeeJWLV7JAFL6Og=; b=iEVWtmA2+jWGvgaZu094E+QoQCYhA//rzDNrLjLQrbXloyprGis7wUAU5Cel+lfmAd 9jfbGLRnXkQvFv0zgWxBe40qaw/hl2hIibqY79OG4PfgLttn/BWNeoqDnzgtOSkqk0Vl nZ+RwT/S2iT/0X2BuiWWQz9b/i4qGAVzrrE9iPa8SVTsz+0czct2c53qqG9M+Cp6UXJq dcqgXaNgLh2Lxwa+6Y1pJHaH43onLHuetZCqU8AcBY/X9q69LvqCle+Z2+aSuje7BtuD XLqCkWooo+61h9icwlfdYbSzg3jxf7CKakaUqWLCofnPcGGkU2GuzvUNoVcuQQeHZf1d U9RQ== Received: by 10.68.195.165 with SMTP id if5mr2589992pbc.131.1352155677624; Mon, 05 Nov 2012 14:47:57 -0800 (PST) Received: from studio.mtv.corp.google.com (studio.mtv.corp.google.com [172.17.131.106]) by mx.google.com with ESMTPS id jx4sm11201653pbc.27.2012.11.05.14.47.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Nov 2012 14:47:56 -0800 (PST) From: Michel Lespinasse To: Andrew Morton , Rik van Riel , Hugh Dickins , linux-kernel@vger.kernel.org, Russell King , Ralf Baechle , Paul Mundt , "David S. Miller" , Chris Metcalf , x86@kernel.org, William Irwin Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH 15/16] mm: use vm_unmapped_area() on sparc32 architecture Date: Mon, 5 Nov 2012 14:47:12 -0800 Message-Id: <1352155633-8648-16-git-send-email-walken@google.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1352155633-8648-1-git-send-email-walken@google.com> References: <1352155633-8648-1-git-send-email-walken@google.com> X-Gm-Message-State: ALoCoQlbcytQaC+noDkcYRX2weW5V7OgPLX35EjdhD82cj8TOFwBMRCbCJhvYOkknMTzg5VvA7nCiQ4QQ4JdtKRQ3ja2/V6UZ1mVTrUalWxxWgfO2olHIJLiXYpHRjce0YauO20vuQ1M6lyRvaqtJpM47bOQEClEw1koQol8KV9iSuTVgDBK9wV1o9J1x664800KI+8SCeq2HK2MtyaoDt7+AjdQ8OXUbA== Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Update the sparc32 arch_get_unmapped_area function to make use of vm_unmapped_area() instead of implementing a brute force search. Signed-off-by: Michel Lespinasse Reviewed-by: Rik van Riel Acked-by: David S. Miller --- arch/sparc/kernel/sys_sparc_32.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c index 0c9b31b22e07..653899849b27 100644 --- a/arch/sparc/kernel/sys_sparc_32.c +++ b/arch/sparc/kernel/sys_sparc_32.c @@ -39,6 +39,7 @@ 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) { /* We do not accept a shared mapping if it would violate @@ -56,21 +57,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi if (!addr) addr = TASK_UNMAPPED_BASE; - if (flags & MAP_SHARED) - addr = COLOUR_ALIGN(addr); - else - addr = PAGE_ALIGN(addr); - - for (vmm = find_vma(current->mm, addr); ; vmm = vmm->vm_next) { - /* At this point: (!vmm || addr < vmm->vm_end). */ - if (TASK_SIZE - PAGE_SIZE - len < addr) - return -ENOMEM; - if (!vmm || addr + len <= vmm->vm_start) - return addr; - addr = vmm->vm_end; - if (flags & MAP_SHARED) - addr = COLOUR_ALIGN(addr); - } + info.flags = 0; + info.length = len; + info.low_limit = addr; + info.high_limit = TASK_SIZE; + info.align_mask = (flags & MAP_SHARED) ? + (PAGE_MASK & (SHMLBA - 1)) : 0; + info.align_offset = pgoff << PAGE_SHIFT; + return vm_unmapped_area(&info); } /*