bitkeeper revision 1.1317 (426426e75ONJGdRHoWdYW1_r-sGgsA)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

BitKeeper/etc/logging_ok

@@ -76,6 +76,7 @@ rn@wyvis.camb.intel-research.net
 rn@wyvis.research.intel-research.net
 rneugeba@wyvis.research
 rneugeba@wyvis.research.intel-research.net
+ryanh@us.ibm.com
 sd386@font.cl.cam.ac.uk
 shand@spidean.research.intel-research.net
 smh22@boulderdash.cl.cam.ac.uk

xen/common/schedule.c

@@ -387,7 +387,7 @@ static void __enter_scheduler(void)
     perfc_incrc(sched_ctx);
 
 #if defined(WAKE_HISTO)
-    if ( !is_idle_task(next) && next->wokenup ) {
+    if ( !is_idle_task(next->domain) && next->wokenup ) {
         ulong diff = (ulong)(now - next->wokenup);
         diff /= (ulong)MILLISECS(1);
         if (diff <= BUCKETS-2)  schedule_data[cpu].hist[diff]++;
@@ -396,7 +396,7 @@ static void __enter_scheduler(void)
     next->wokenup = (s_time_t)0;
 #elif defined(BLOCKTIME_HISTO)
     prev->lastdeschd = now;
-    if ( !is_idle_task(next) )
+    if ( !is_idle_task(next->domain) )
     {
         ulong diff = (ulong)((now - next->lastdeschd) / MILLISECS(10));
         if (diff <= BUCKETS-2)  schedule_data[cpu].hist[diff]++;