From: Nishanth Aravamudan <nacc@us.ibm.com>
Subject: [Kernel-janitors] [PATCH 2.6.9-rc2 20/38] net/ixgb_osdep: replace 	schedule_timeout() with msleep()




Use msleep() instead of schedule_timeout()
to guarantee the task delays as expected. I was told earlier that the
in_interrupt() check is not necessary. It would be nice to get some
verification of this (i.e. the driver functions the same without it).

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
 ixgb_osdep.h |    8 +-------
 1 files changed, 1 insertion(+), 7 deletions(-)

Index: quilt/drivers/net/ixgb/ixgb_osdep.h
===================================================================
--- quilt.orig/drivers/net/ixgb/ixgb_osdep.h
+++ quilt/drivers/net/ixgb/ixgb_osdep.h
@@ -41,13 +41,7 @@
 #include <linux/sched.h>
 
 #ifndef msec_delay
-#define msec_delay(x)	do { if(in_interrupt()) { \
-				/* Don't mdelay in interrupt context! */ \
-	                	BUG(); \
-			} else { \
-				set_current_state(TASK_UNINTERRUPTIBLE); \
-				schedule_timeout((x * HZ)/1000 + 2); \
-			} } while(0)
+#define msec_delay(x)	msleep(x)
 #endif
 
 #define PCI_COMMAND_REGISTER   PCI_COMMAND