From 0a6101faa8e1fc99890f410903f0cee1470f73df Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Wed, 8 Jul 2009 20:09:44 -0700
Subject: [PATCH] --- yaml --- r: 155143 b: refs/heads/master c:
 1b614fb9a00e97b1eab54d4e442d405229c059dd h: refs/heads/master i:   155141:
 b452ab71c69b541f79390029afa92e815c8bfe16   155139:
 2caedbc889cc84e95fd869206b1b88f57745cbe5   155135:
 6dd8406e32e64aa0c33084dcfd3b79c5a3925a24 v: v3

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

diff --git a/[refs] b/[refs]
index 08f2318b9ac9..de0bc49b9900 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2daeabf62a5fb205d413c35cf604021db17536b
+refs/heads/master: 1b614fb9a00e97b1eab54d4e442d405229c059dd
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index 9675f312830d..df30feb2fc72 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -740,7 +740,7 @@ int netpoll_setup(struct netpoll *np)
 				       np->name);
 				break;
 			}
-			cond_resched();
+			msleep(1);
 		}
 
 		/* If carrier appears to come up instantly, we don't