diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2010-06-30 11:59:12 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-01 22:45:52 -0700 |
| commit | 3d8009c780ee90fccb5c171caf30aff839f13547 (patch) | |
| tree | 489b142084ea073201e02ac8bbb91cf1a0400830 /drivers/net/ehea | |
| parent | 05318bc905467237d4aa68a701f6e92a2b332218 (diff) | |
| download | op-kernel-dev-3d8009c780ee90fccb5c171caf30aff839f13547.zip op-kernel-dev-3d8009c780ee90fccb5c171caf30aff839f13547.tar.gz | |
ehea: Allocate stats buffer with GFP_KERNEL
Since ehea_get_stats calls ehea_h_query_ehea_port, which
can sleep, we can also sleep when allocating a page in
this function. This fixes some memory allocation failure
warnings seen under low memory conditions.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ehea')
| -rw-r--r-- | drivers/net/ehea/ehea_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 8b92acb..3beba70 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c @@ -335,7 +335,7 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev) memset(stats, 0, sizeof(*stats)); - cb2 = (void *)get_zeroed_page(GFP_ATOMIC); + cb2 = (void *)get_zeroed_page(GFP_KERNEL); if (!cb2) { ehea_error("no mem for cb2"); goto out; |
