From patchwork Thu Jan 7 19:21:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 43534 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 4DE4DB7CD5 for ; Sat, 23 Jan 2010 10:26:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754762Ab0AVXYM (ORCPT ); Fri, 22 Jan 2010 18:24:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755338Ab0AVXYK (ORCPT ); Fri, 22 Jan 2010 18:24:10 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:39696 "EHLO fmmailgate01.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754762Ab0AVXYE (ORCPT ); Fri, 22 Jan 2010 18:24:04 -0500 Received: from smtp08.web.de (fmsmtp08.dlan.cinetic.de [172.20.5.216]) by fmmailgate01.web.de (Postfix) with ESMTP id 661A91456CF17; Sat, 23 Jan 2010 00:24:03 +0100 (CET) Received: from [92.75.141.69] (helo=[192.168.1.10]) by smtp08.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #314) id 1NYSrD-0006RS-00; Sat, 23 Jan 2010 00:24:03 +0100 Message-Id: In-Reply-To: References: From: Jan Kiszka To: David Miller , Karsten Keil Cc: linux-kernel@vger.kernel.org, i4ldeveloper@listserv.isdn4linux.de, isdn4linux@listserv.isdn4linux.de, netdev@vger.kernel.org Date: Thu, 7 Jan 2010 20:21:27 +0100 Subject: [PATCH 16/31] CAPI: Use non-atomic allocation during NCCI setup X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/2PHSsj2U/3pksdHqOnUxAFtH9Cme4Y1Xh6G0y K+4gNd72En3X9pK/X9gz2+zvju12RLVdCaXqwnzZF9e9BRwuTH oWubLZiAY= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Both capincci_alloc and capiminor_alloc run in non-atomic context, update their memory allocations accordingly. Signed-off-by: Jan Kiszka --- drivers/isdn/capi/capi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index e7830b7..b71b8b1 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c @@ -216,7 +216,7 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci) unsigned int minor = 0; unsigned long flags; - mp = kzalloc(sizeof(*mp), GFP_ATOMIC); + mp = kzalloc(sizeof(*mp), GFP_KERNEL); if (!mp) { printk(KERN_ERR "capi: can't alloc capiminorn"); return NULL; @@ -357,7 +357,7 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci) { struct capincci *np, **pp; - np = kzalloc(sizeof(*np), GFP_ATOMIC); + np = kzalloc(sizeof(*np), GFP_KERNEL); if (!np) return NULL; np->ncci = ncci;