rpms/kernel/devel kernel-2.6.spec, 1.3235, 1.3236 linux-2.6-sched-cfs.patch, 1.6, 1.7

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15073

Modified Files:
	kernel-2.6.spec linux-2.6-sched-cfs.patch 
Log Message:
* Sun Jun 24 2007 Dave Jones <davej at redhat.com>
- Fix 64 bit overflow in CFS.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3235
retrieving revision 1.3236
diff -u -r1.3235 -r1.3236
--- kernel-2.6.spec	24 Jun 2007 03:42:11 -0000	1.3235
+++ kernel-2.6.spec	25 Jun 2007 03:00:46 -0000	1.3236
@@ -2088,6 +2088,9 @@
 %endif
 
 %changelog
+* Sun Jun 24 2007 Dave Jones <davej at redhat.com>
+- Fix 64 bit overflow in CFS.
+
 * Sat Jun 23 2007 Dave Jones <davej at redhat.com>
 - DMI based module autoloading.
 

linux-2.6-sched-cfs.patch:

Index: linux-2.6-sched-cfs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-sched-cfs.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-sched-cfs.patch	24 Jun 2007 03:42:12 -0000	1.6
+++ linux-2.6-sched-cfs.patch	25 Jun 2007 03:00:46 -0000	1.7
@@ -7055,3 +7055,20 @@
  		.ctl_name	= KERN_PANIC,
  		.procname	= "panic",
  		.data		= &panic_timeout,
+Index: linux/kernel/sched_fair.c
+===================================================================
+--- linux.orig/kernel/sched_fair.c
++++ linux/kernel/sched_fair.c
+@@ -342,8 +342,9 @@ update_stats_enqueue(struct cfs_rq *cfs_
+ 		s64 tmp;
+ 
+ 		if (se->wait_runtime < 0) {
+-			tmp = (0 - se->wait_runtime) << NICE_0_SHIFT;
+-			key += (tmp * se->load.inv_weight) >> WMULT_SHIFT;
++			tmp = -se->wait_runtime;
++			key += (tmp * se->load.inv_weight) >>
++					(WMULT_SHIFT - NICE_0_SHIFT);
+ 		} else {
+ 			tmp = se->wait_runtime * se->load.weight;
+ 			key -= tmp >> NICE_0_SHIFT;
+