rpms/kernel/devel kernel-2.6.spec, 1.1997, 1.1998 linux-2.6-xen-cpusteal-hv.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: riel

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

Modified Files:
	kernel-2.6.spec linux-2.6-xen-cpusteal-hv.patch 
Log Message:
just look at what gets checked in upstream


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1997
retrieving revision 1.1998
diff -u -r1.1997 -r1.1998
--- kernel-2.6.spec	28 Feb 2006 23:23:24 -0000	1.1997
+++ kernel-2.6.spec	1 Mar 2006 14:28:25 -0000	1.1998
@@ -3,15 +3,15 @@
 # What parts do we want to build?  We must build at least one kernel.
 # These are the kernels that are built IF the architecture allows it.
 
-%define buildup 1
-%define buildsmp 1
+%define buildup 0
+%define buildsmp 0
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 0
+%define buildxen 1
 %define buildxenPAE 0
 %define builddoc 0
-%define buildkdump 1
+%define buildkdump 0
 
 # Versions of various parts
 

linux-2.6-xen-cpusteal-hv.patch:
 common/dom0_ops.c      |    9 ++
 common/domain.c        |   13 ++++
 common/keyhandler.c    |    6 -
 common/sched_bvt.c     |   13 +---
 common/sched_sedf.c    |    8 --
 common/schedule.c      |  152 +++++++++++++++++++++----------------------------
 include/public/vcpu.h  |   34 ++++++++++
 include/xen/sched-if.h |    6 -
 include/xen/sched.h    |   12 +--
 9 files changed, 134 insertions(+), 119 deletions(-)

Index: linux-2.6-xen-cpusteal-hv.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-cpusteal-hv.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-cpusteal-hv.patch	28 Feb 2006 16:28:16 -0000	1.2
+++ linux-2.6-xen-cpusteal-hv.patch	1 Mar 2006 14:28:26 -0000	1.3
@@ -207,7 +207,7 @@
 +    {
 +        /* Fast lock-free path. */
 +        memcpy(runstate, &v->runstate, sizeof(*runstate));
-+        ASSERT(runstate->state = RUNSTATE_running);
++        ASSERT(runstate->state == RUNSTATE_running);
 +        runstate->time[RUNSTATE_running] += NOW() - runstate->state_entry_time;
 +    }
 +    else