rpms/kernel-xen-2.6/devel kernel-2.6.20-i686-xen.config, 1.2, 1.3 kernel-2.6.20-ia64-xen.config, 1.1, 1.2 kernel-2.6.20-x86_64-xen.config, 1.3, 1.4 kernel-xen.spec, 1.27, 1.28

[Eduardo Habkost (ehabkost)]

Author: ehabkost

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

Modified Files:
	kernel-2.6.20-i686-xen.config kernel-2.6.20-ia64-xen.config 
	kernel-2.6.20-x86_64-xen.config kernel-xen.spec 
Log Message:
Importing fix to bug #239601 from F-7 branch




Index: kernel-2.6.20-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.20-i686-xen.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kernel-2.6.20-i686-xen.config	8 May 2007 07:27:02 -0000	1.2
+++ kernel-2.6.20-i686-xen.config	11 Jun 2007 19:05:50 -0000	1.3
@@ -3008,7 +3008,7 @@
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
+# CONFIG_PROVE_LOCKING is not set
 CONFIG_DEBUG_VM=y
 
 CONFIG_FAULT_INJECTION=y


Index: kernel-2.6.20-ia64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.20-ia64-xen.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kernel-2.6.20-ia64-xen.config	22 Mar 2007 16:01:16 -0000	1.1
+++ kernel-2.6.20-ia64-xen.config	11 Jun 2007 19:05:50 -0000	1.2
@@ -3008,7 +3008,7 @@
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
+# CONFIG_PROVE_LOCKING is not set
 CONFIG_DEBUG_VM=y
 
 CONFIG_FAULT_INJECTION=y


Index: kernel-2.6.20-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.20-x86_64-xen.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kernel-2.6.20-x86_64-xen.config	8 May 2007 07:27:02 -0000	1.3
+++ kernel-2.6.20-x86_64-xen.config	11 Jun 2007 19:05:50 -0000	1.4
@@ -3006,7 +3006,7 @@
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_DEBUG_RWSEMS=y
 CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
+# CONFIG_PROVE_LOCKING is not set
 CONFIG_DEBUG_VM=y
 
 CONFIG_FAULT_INJECTION=y


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kernel-xen.spec	11 Jun 2007 18:44:46 -0000	1.27
+++ kernel-xen.spec	11 Jun 2007 19:05:50 -0000	1.28
@@ -2017,6 +2017,8 @@
 %changelog
 * Mon Jun 11 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Added fix to bug #215201: linux-2.6-xen-fix-nosegneg-detection.patch
+- Disabled CONFIG_PROVE_LOCKING, as the xen code doesn't support it.
+  See bug #239601
 
 * Tue May 22 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Add patch from bug #209429: linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch