rpms/kernel/devel branch, 1.1.2.3, 1.1.2.4 kernel.spec, 1.1294.2.66, 1.1294.2.67 xen.pvops.post.patch, 1.1.2.26, 1.1.2.27

[myoung]

Author: myoung

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

Modified Files:
      Tag: private-myoung-dom0-branch
	branch kernel.spec xen.pvops.post.patch 
Log Message:
test a pvops fix and correct the branch label



Index: branch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/branch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.3 -r1.1.2.4
--- branch	24 Apr 2009 22:27:04 -0000	1.1.2.3
+++ branch	15 Sep 2009 23:03:20 -0000	1.1.2.4
@@ -1 +1 @@
-devel
+F-12


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.66
retrieving revision 1.1294.2.67
diff -u -p -r1.1294.2.66 -r1.1294.2.67
--- kernel.spec	15 Sep 2009 19:45:39 -0000	1.1294.2.66
+++ kernel.spec	15 Sep 2009 23:03:21 -0000	1.1294.2.67
@@ -2051,6 +2051,7 @@ fi
 %changelog
 * Tue Sep 15 2009 Michael Young <m.a.young at durham.ac.uk>
 - switch to the F-12 branch for the moment
+- try an NX related fix
 
 * Tue Sep 15 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: misc fixes to context-related issues, fixes some severe nv4x bugs

xen.pvops.post.patch:
 b/arch/x86/include/asm/paravirt_types.h |    3 +++
 b/arch/x86/kernel/process_32.c          |    2 ++
 b/arch/x86/mm/Makefile                  |    1 +
 b/arch/x86/pci/common.c                 |   16 ++++++++++++++++
 b/arch/x86/xen/enlighten.c              |   10 +++++-----
 b/include/linux/swiotlb.h               |    1 +
 drivers/pci/pci.h                       |    2 ++
 7 files changed, 30 insertions(+), 5 deletions(-)

Index: xen.pvops.post.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Attic/xen.pvops.post.patch,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -p -r1.1.2.26 -r1.1.2.27
--- xen.pvops.post.patch	5 Sep 2009 19:00:27 -0000	1.1.2.26
+++ xen.pvops.post.patch	15 Sep 2009 23:03:23 -0000	1.1.2.27
@@ -80,3 +80,43 @@ index cb1a663..f4ebffb 100644
  
  struct device;
  struct dma_attrs;
+diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
+index 72bb3a2..0088329 100644
+--- a/arch/x86/mm/Makefile
++++ b/arch/x86/mm/Makefile
+@@ -4,6 +4,7 @@ obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
+ # Make sure __phys_addr has no stackprotector
+ nostackp := $(call cc-option, -fno-stack-protector)
+ CFLAGS_physaddr.o		:= $(nostackp)
++CFLAGS_init.o			:= $(nostackp)
+ 
+ obj-$(CONFIG_SMP)		+= tlb.o
+ 
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index 03644f9..5b55c92 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -1092,6 +1092,11 @@ asmlinkage void __init xen_start_kernel(void)
+ 
+ 	__supported_pte_mask |= _PAGE_IOMAP;
+ 
++#ifdef CONFIG_X86_64
++	/* Work out if we support NX */
++	check_efer();
++#endif
++
+ 	xen_setup_features();
+ 
+ 	/* Get mfn list */
+@@ -1132,11 +1137,6 @@ asmlinkage void __init xen_start_kernel(void)
+ 
+ 	pgd = (pgd_t *)xen_start_info->pt_base;
+ 
+-#ifdef CONFIG_X86_64
+-	/* Work out if we support NX */
+-	check_efer();
+-#endif
+-
+ 	/* Don't do the full vcpu_info placement stuff until we have a
+ 	   possible map and a non-dummy shared_info. */
+ 	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];