From 9688e866931a003bc52fb88d4243a7e51a6d7c0e Mon Sep 17 00:00:00 2001
From: Brian King <brking@linux.vnet.ibm.com>
Date: Wed, 30 Jun 2010 11:59:12 +0000
Subject: [PATCH] --- yaml --- r: 203338 b: refs/heads/master c:
 3d8009c780ee90fccb5c171caf30aff839f13547 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/ehea/ehea_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 04f86ffed870..60d72911cc40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05318bc905467237d4aa68a701f6e92a2b332218
+refs/heads/master: 3d8009c780ee90fccb5c171caf30aff839f13547
diff --git a/trunk/drivers/net/ehea/ehea_main.c b/trunk/drivers/net/ehea/ehea_main.c
index 8b92acb448c2..3beba70b7dea 100644
--- a/trunk/drivers/net/ehea/ehea_main.c
+++ b/trunk/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;