SOURCES: kernel-desktop-ck.patch - up for 2.6.20.4

[sparky]

Author: sparky                       Date: Tue Mar 27 22:48:48 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for 2.6.20.4

---- Files affected:
SOURCES:
   kernel-desktop-ck.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-ck.patch
diff -u SOURCES/kernel-desktop-ck.patch:1.7 SOURCES/kernel-desktop-ck.patch:1.8
--- SOURCES/kernel-desktop-ck.patch:1.7	Wed Mar 28 00:46:51 2007
+++ SOURCES/kernel-desktop-ck.patch	Wed Mar 28 00:48:43 2007
@@ -1703,9 +1703,10 @@
 -		}
 -	}
 -	next->sleep_type = SLEEP_NORMAL;
- 	if (dependent_sleeper(cpu, rq, next))
+-	if (rq->nr_running == 1 && dependent_sleeper(cpu, rq, next))
++	if (dependent_sleeper(cpu, rq, next)) { if (rq->nr_running == 1)
  		next = rq->idle;
-+	else {
++	} else {
 +		prefetch(next);
 +		prefetch_stack(next);
 +	}
@@ -1727,7 +1728,7 @@
  	sched_info_switch(prev, next);
  	if (likely(prev != next)) {
 +		rq->preempted = rq->cache_ticks = 0;
- 		next->timestamp = now;
+ 		next->timestamp = next->last_ran = now;
  		rq->nr_switches++;
  		rq->curr = next;
 @@ -3978,29 +3856,21 @@ EXPORT_SYMBOL(sleep_on_timeout);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-ck.patch?r1=1.7&r2=1.8&f=u