From 35c987b90a5bed0ba4087188ba2244fc4a07f7c5 Mon Sep 17 00:00:00 2001
From: Sebastian Siewior <sebastian@breakpoint.cc>
Date: Sat, 14 Feb 2009 23:26:18 +0000
Subject: [PATCH] --- yaml --- r: 131689 b: refs/heads/master c:
 82a5bd6a7b1b60b5d357e2e4b93b914f57314016 h: refs/heads/master i:   131687:
 6d15e7c61d567befc860963dda5b188e30b3bc83 v: v3

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

diff --git a/[refs] b/[refs]
index f98e7931cd25..49061594db9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43250ddd75a35d1f7926d989a10fefd30c37eaa7
+refs/heads/master: 82a5bd6a7b1b60b5d357e2e4b93b914f57314016
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index 5f31bbb614af..b6ab46942b98 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -1575,7 +1575,7 @@ static void mv643xx_eth_program_multicast_filter(struct net_device *dev)
 		return;
 	}
 
-	mc_spec = kmalloc(0x200, GFP_KERNEL);
+	mc_spec = kmalloc(0x200, GFP_ATOMIC);
 	if (mc_spec == NULL)
 		goto oom;
 	mc_other = mc_spec + (0x100 >> 2);