rpms/kernel/devel kernel.spec, 1.1294.2.76, 1.1294.2.77 xen.pvops.post.patch, 1.1.2.31, 1.1.2.32

myoung myoung at fedoraproject.org
Thu Nov 12 15:38:27 UTC 2009


Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12782

Modified Files:
      Tag: private-myoung-dom0-branch
	kernel.spec xen.pvops.post.patch 
Log Message:
Another change to get XEN_NETCHANNEL to compile



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.76
retrieving revision 1.1294.2.77
diff -u -p -r1.1294.2.76 -r1.1294.2.77
--- kernel.spec	12 Nov 2009 11:34:24 -0000	1.1294.2.76
+++ kernel.spec	12 Nov 2009 15:38:26 -0000	1.1294.2.77
@@ -2175,7 +2175,7 @@ fi
 
 %changelog
 * Thu Nov 12 2009 Michael Young <m.a.young at durham.ac.uk>
-- XEN_NETCHANNEL2 doesn't compile as a module
+- XEN_NETCHANNEL2 doesn't compile as a module and depends on XEN_XENBUS_FRONTEND
 
 * Wed Nov 11 2009 Justin M. Forbes <jforbes at redhat.com> 2.6.31.5-128
 - Fix KSM for i686 users. (#532215)

xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 b/drivers/gpu/drm/drm_gem.c             |    1 -
 drivers/pci/pci.h                       |    2 ++
 linux-2.6.31.noarch/arch/x86/Makefile   |    1 -
 linux-2.6.31.x86_64/drivers/net/Kconfig |    1 +
 7 files changed, 24 insertions(+), 2 deletions(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -p -r1.1.2.31 -r1.1.2.32
--- xen.pvops.post.patch	8 Nov 2009 22:36:45 -0000	1.1.2.31
+++ xen.pvops.post.patch	12 Nov 2009 15:38:27 -0000	1.1.2.32
@@ -91,3 +91,13 @@ diff -up linux-2.6.31.noarch/arch/x86/Ma
                  KBUILD_CFLAGS += $(stackp-y)
          else
                  $(warning stack protector enabled but no compiler support)
+--- linux-2.6.31.x86_64/drivers/net/Kconfig.orig	2009-11-08 22:18:22.000000000 +0000
++++ linux-2.6.31.x86_64/drivers/net/Kconfig	2009-11-12 15:16:51.000000000 +0000
+@@ -2778,6 +2778,7 @@
+ config XEN_NETCHANNEL2
+ 	tristate "Net channel 2 support"
+ 	depends on XEN && NET
++	select XEN_XENBUS_FRONTEND
+ 	help
+ 	  Xen netchannel2 driver support.  This allows a domain to act as
+ 	  either the backend or frontend part of a netchannel2 connection.




More information about the scm-commits mailing list