rpms/kernel/devel kernel-2.6.spec, 1.2114, 1.2115 xen-sched-sedf.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: jmorris

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31980/devel

Modified Files:
	kernel-2.6.spec xen-sched-sedf.patch 
Log Message:
Rework dom0 sedf scheduler defaults patch, bz # 181856



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2114
retrieving revision 1.2115
diff -u -r1.2114 -r1.2115
--- kernel-2.6.spec	1 Apr 2006 21:43:03 -0000	1.2114
+++ kernel-2.6.spec	2 Apr 2006 07:24:38 -0000	1.2115
@@ -681,7 +681,7 @@
 cp -rl xen-vanilla xen
 
 # Any necessary hypervisor patches go here
-%patch20000 -p1
+%patch20000 -p0
 
 cd linux-%{kversion}.%{_target_cpu}
 
@@ -1594,6 +1594,9 @@
 %endif
 
 %changelog
+* Sun Apr  2 2006 James Morris <jmorris at redhat.com>
+- Rework dom0 sedf scheduler defaults patch, bz # 181856
+
 * Sat Apr  1 2006 Dave Jones <davej at redhat.com>
 - 2.6.16-git20
 

xen-sched-sedf.patch:
 sched_sedf.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

Index: xen-sched-sedf.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/xen-sched-sedf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-sched-sedf.patch	13 Mar 2006 17:13:59 -0000	1.1
+++ xen-sched-sedf.patch	2 Apr 2006 07:24:38 -0000	1.2
@@ -1,20 +1,23 @@
 Signed-off-by: James Morris <jmorris at redhat.com>
 
---- xen-3.0.1/xen/common/sched_sedf.c	2006-03-01 17:39:01.000000000 -0500
-+++ xen-3.0.1.w/xen/common/sched_sedf.c	2006-03-13 02:29:18.000000000 -0500
-@@ -374,9 +374,15 @@
+diff -pur xen/common/sched_sedf.c xen.w/common/sched_sedf.c
+--- xen/common/sched_sedf.c	2006-04-02 00:00:27.000000000 -0500
++++ xen.w/common/sched_sedf.c	2006-04-02 00:34:11.000000000 -0500
+@@ -374,9 +374,15 @@ static void sedf_add_task(struct vcpu *d
      if ( d->domain->domain_id == 0 )
      {
          /*set dom0 to something useful to boot the machine*/
+-        inf->period    = MILLISECS(20);
+-        inf->slice     = MILLISECS(15);
 +        /*
-+         * jmorris at redhat.com: workaround to stop soft cpu lockups
-+         * in guests, per
-+         * http://lists.xensource.com/archives/html/xen-devel/2006-02/msg00721.html
++         * Simulate manual workaround for bz #181856, which assigns
++         * the lowest slice weight value for dom0 + extra time.
 +         */
-         inf->period    = MILLISECS(20);
-         inf->slice     = MILLISECS(15);
++        inf->period    = WEIGHT_PERIOD;
++        inf->slice     = 0;
          inf->latency   = 0;
 +        inf->extraweight = 1;
++        inf->weight    = 0;
          inf->deadl_abs = 0;
          inf->status     = EXTRA_AWARE | SEDF_ASLEEP;
      }