bitkeeper revision 1.445 (3f6b3cbfPoEFlaJ9_8AHKqhfHOuhyQ)

e100.h, schedule.c:
  Yet another e100/schedule_timeout fix.

2 files changed, 14 insertions, 27 deletions

diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index 616598a7a3..c17efab8aa 100644
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -648,33 +648,16 @@ long schedule_timeout(long timeout)
     
     expire = timeout + jiffies;
     
-    if ( is_idle_task(current) )
-    {
-        /*
-         * If the idle task is calling in then it shouldn't ever sleep. We 
-         * therefore force it to TASK_RUNNING here and busy-wait. We spin on 
-         * schedule to give other domains a chance meanwhile.
-         */
-        set_current_state(TASK_RUNNING);
-        do { 
-            schedule();
-            timeout = expire - jiffies;
-        } 
-        while ( (timeout > 0) && is_idle_task(current) );
-    }
-    else
-    {
-        init_timer(&timer);
-        timer.expires = expire;
-        timer.data = (unsigned long) current;
-        timer.function = process_timeout;
-        
-        add_timer(&timer);
-        schedule();
-        del_timer_sync(&timer);
-        
-        timeout = expire - jiffies;
-    }
+    init_timer(&timer);
+    timer.expires = expire;
+    timer.data = (unsigned long) current;
+    timer.function = process_timeout;
+    
+    add_timer(&timer);
+    schedule();
+    del_timer_sync(&timer);
+    
+    timeout = expire - jiffies;
 
  out:
     return timeout < 0 ? 0 : timeout;
diff --git a/xen/drivers/net/e100/e100.h b/xen/drivers/net/e100/e100.h
index 456d2c7ec8..75b73a024d 100644
--- a/xen/drivers/net/e100/e100.h
+++ b/xen/drivers/net/e100/e100.h
@@ -62,6 +62,10 @@
 
 #define yield() ((void)0)
 
+#define schedule_timeout(_t)       \
+  set_current_state(TASK_RUNNING); \
+  mdelay((_t)*(1000/HZ))
+
 #define E100_REGS_LEN 1
 /*
  *  Configure parameters for buffers per controller.