From b41e1046aaf8eabae5d987c5ace5c7c84fa6378d Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 29 Nov 2012 23:27:20 +0000 Subject: [PATCH] --- yaml --- r: 341712 b: refs/heads/master c: a1db5c5b75d6781e8e4dcd6621d5c10463bee0ef h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/atm/solos-pci.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b66871368cc8..6082f7b218e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 213e85d389124f49c82d52cfb4473b8bb672f7c1 +refs/heads/master: a1db5c5b75d6781e8e4dcd6621d5c10463bee0ef diff --git a/trunk/drivers/atm/solos-pci.c b/trunk/drivers/atm/solos-pci.c index 3f7c4ef1e111..e3c25dc9edc1 100644 --- a/trunk/drivers/atm/solos-pci.c +++ b/trunk/drivers/atm/solos-pci.c @@ -841,7 +841,7 @@ static int popen(struct atm_vcc *vcc) return -EINVAL; } - skb = alloc_skb(sizeof(*header), GFP_ATOMIC); + skb = alloc_skb(sizeof(*header), GFP_KERNEL); if (!skb) { if (net_ratelimit()) dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n"); @@ -881,7 +881,7 @@ static void pclose(struct atm_vcc *vcc) } spin_unlock(&card->tx_queue_lock); - skb = alloc_skb(sizeof(*header), GFP_ATOMIC); + skb = alloc_skb(sizeof(*header), GFP_KERNEL); if (!skb) { dev_warn(&card->dev->dev, "Failed to allocate sk_buff in pclose()\n"); return; @@ -1268,7 +1268,7 @@ static int atm_init(struct solos_card *card, struct device *parent) card->atmdev[i]->phy_data = (void *)(unsigned long)i; atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_FOUND); - skb = alloc_skb(sizeof(*header), GFP_ATOMIC); + skb = alloc_skb(sizeof(*header), GFP_KERNEL); if (!skb) { dev_warn(&card->dev->dev, "Failed to allocate sk_buff in atm_init()\n"); continue;