From patchwork Wed Jul 21 02:44:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rientjes X-Patchwork-Id: 59399 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 E658AB70C0 for ; Wed, 21 Jul 2010 12:45:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762087Ab0GUCo7 (ORCPT ); Tue, 20 Jul 2010 22:44:59 -0400 Received: from smtp-out.google.com ([74.125.121.35]:28930 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762086Ab0GUCo7 (ORCPT ); Tue, 20 Jul 2010 22:44:59 -0400 Received: from wpaz29.hot.corp.google.com (wpaz29.hot.corp.google.com [172.24.198.93]) by smtp-out.google.com with ESMTP id o6L2ivZu017788 for ; Tue, 20 Jul 2010 19:44:57 -0700 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1279680297; bh=SqaY9TBJTrVQcSXVJj1mhKcOPXI=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References: MIME-Version:Content-Type; b=FIiCRvmOoGOtRWY+LidnPQC6zRHaum2hvsuGkeiLwpIOOKTPmfnFZnF0AexFe4RLX GY5A//Ewk3/4/LnZfYMCA== DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id: references:user-agent:mime-version:content-type:x-system-of-record; b=lMjem+8QgMvaUjZlgK9qHayQVp6mxzvBHYRmAMIk4WytFQXYSzoVZh1vtWghH1jtV oOVq6sYIC4Xe9tzPX9S2g== Received: from pvh11 (pvh11.prod.google.com [10.241.210.203]) by wpaz29.hot.corp.google.com with ESMTP id o6L2itWx017068 for ; Tue, 20 Jul 2010 19:44:56 -0700 Received: by pvh11 with SMTP id 11so3576348pvh.24 for ; Tue, 20 Jul 2010 19:44:55 -0700 (PDT) Received: by 10.142.147.7 with SMTP id u7mr10659442wfd.50.1279680295479; Tue, 20 Jul 2010 19:44:55 -0700 (PDT) Received: from chino.kir.corp.google.com (chino.kir.corp.google.com [172.31.6.12]) by mx.google.com with ESMTPS id b23sm6155435rvf.18.2010.07.20.19.44.53 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 20 Jul 2010 19:44:54 -0700 (PDT) Date: Tue, 20 Jul 2010 19:44:53 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: "David S. Miller" , Andrew Morton cc: Benjamin Herrenschmidt , sparclinux@vger.kernel.org, linux-mm@kvack.org Subject: [patch 1/6] sparc: remove dependency on __GFP_NOFAIL In-Reply-To: Message-ID: References: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-System-Of-Record: true Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org The kmalloc() in mdesc_kmalloc() is failable, so remove __GFP_NOFAIL from its mask. Cc: Benjamin Herrenschmidt Signed-off-by: David Rientjes --- arch/sparc/kernel/mdesc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c --- a/arch/sparc/kernel/mdesc.c +++ b/arch/sparc/kernel/mdesc.c @@ -134,7 +134,7 @@ static struct mdesc_handle *mdesc_kmalloc(unsigned int mdesc_size) sizeof(struct mdesc_hdr) + mdesc_size); - base = kmalloc(handle_size + 15, GFP_KERNEL | __GFP_NOFAIL); + base = kmalloc(handle_size + 15, GFP_KERNEL); if (base) { struct mdesc_handle *hp; unsigned long addr;