From d170632ccd99dcc40ce6ff32c2c6bff3d17edb70 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 26 Oct 2007 04:23:22 -0700
Subject: [PATCH] --- yaml --- r: 72624 b: refs/heads/master c:
 43cc7380eced27ee9cafdf89fa32333dc3884e8b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 644a7d04265e..d2b947504ce2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ad7c62b752483982a678c78a52a70f498b84cbb
+refs/heads/master: 43cc7380eced27ee9cafdf89fa32333dc3884e8b
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 811024e311bd..9b0c8f12373e 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -390,7 +390,7 @@ static inline void napi_complete(struct napi_struct *n)
 static inline void napi_disable(struct napi_struct *n)
 {
 	while (test_and_set_bit(NAPI_STATE_SCHED, &n->state))
-		msleep_interruptible(1);
+		msleep(1);
 }
 
 /**