Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754829AbdLFFtW (ORCPT ); Wed, 6 Dec 2017 00:49:22 -0500 Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:2718 "EHLO mail2-relais-roc.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754770AbdLFFtV (ORCPT ); Wed, 6 Dec 2017 00:49:21 -0500 X-IronPort-AV: E=Sophos;i="5.45,367,1508796000"; d="scan'208";a="304158058" Date: Wed, 6 Dec 2017 06:49:18 +0100 (CET) From: Julia Lawall X-X-Sender: jll@hadrien To: Julia Cartwright cc: David Miller , Julia Lawall , rafalo@cadence.com, nicolas.ferre@microchip.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kbuild-all@01.org Subject: Re: [PATCH v2 3/3] net: macb: change GFP_ATOMIC to GFP_KERNEL In-Reply-To: Message-ID: References: <20171205.180031.935589370339834625.davem@davemloft.net> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1083 Lines: 37 On Tue, 5 Dec 2017, Julia Cartwright wrote: > Now that the rx_fs_lock is no longer held across allocation, it's safe > to use GFP_KERNEL for allocating new entries. > > This reverts commit 81da3bf6e3f88 ("net: macb: change GFP_KERNEL to > GFP_ATOMIC"). > > Cc: Julia Lawall > Signed-off-by: Julia Cartwright Acked-by: Julia Lawall > --- > drivers/net/ethernet/cadence/macb_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index 758e8b3042b2..234667eaaa92 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -2800,7 +2800,7 @@ static int gem_add_flow_filter(struct net_device *netdev, > int ret = -EINVAL; > bool added = false; > > - newfs = kmalloc(sizeof(*newfs), GFP_ATOMIC); > + newfs = kmalloc(sizeof(*newfs), GFP_KERNEL); > if (newfs == NULL) > return -ENOMEM; > memcpy(&newfs->fs, fs, sizeof(newfs->fs)); > -- > 2.14.2 > >