rpms/kernel/F-11 linux-2.6-xen-check-for-nx-support.patch, NONE, 1.1 TODO, 1.66, 1.67 kernel.spec, 1.1562, 1.1563

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27318

Modified Files:
	TODO kernel.spec 
Added Files:
	linux-2.6-xen-check-for-nx-support.patch 
Log Message:
* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2.6.29.1-101
- Fix xen boot on machines without NX support (#492523)


linux-2.6-xen-check-for-nx-support.patch:

--- NEW FILE linux-2.6-xen-check-for-nx-support.patch ---
>From bc6081ff98eec627919e0c68415e46a78fe51dc4 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Fri, 27 Mar 2009 11:29:02 -0700
Subject: [PATCH] xen: set _PAGE_NX in __supported_pte_mask before pagetable construction

Some 64-bit machines don't support the NX flag in ptes.
Check for NX before constructing the kernel pagetables.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
---
 arch/x86/xen/enlighten.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 69de191..f7d0fd7 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -42,6 +42,7 @@
 #include <asm/xen/hypervisor.h>
 #include <asm/fixmap.h>
 #include <asm/processor.h>
+#include <asm/proto.h>
 #include <asm/msr-index.h>
 #include <asm/setup.h>
 #include <asm/desc.h>
@@ -914,7 +915,6 @@ static const struct machine_ops __initdata xen_machine_ops = {
 	.emergency_restart = xen_emergency_restart,
 };
 
-
 /* First C function to be called on Xen boot */
 asmlinkage void __init xen_start_kernel(void)
 {
@@ -982,6 +982,11 @@ asmlinkage void __init xen_start_kernel(void)
 	if (!xen_initial_domain())
 		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);
 
+#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];
-- 
1.6.0.6



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/TODO,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- TODO	15 Apr 2009 22:41:21 -0000	1.66
+++ TODO	19 Apr 2009 12:38:38 -0000	1.67
@@ -112,4 +112,7 @@
 * linux-2.6-kvm-skip-pit-check.patch:
 	Waiting to be pushed upstream from kvm git.
 
-
+* linux-2.6-xen-check-for-nx-support.patch
+	https://bugzilla.redhat.com/492523
+	Needed for xen domU to boot on some machines. Upstream since
+	2.6.30-rc2.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1562
retrieving revision 1.1563
diff -u -r1.1562 -r1.1563
--- kernel.spec	18 Apr 2009 21:52:16 -0000	1.1562
+++ kernel.spec	19 Apr 2009 12:38:38 -0000	1.1563
@@ -748,8 +748,8 @@
 Patch9300: linux-2.6-kvm-kconfig-irqchip.patch
 Patch9301: linux-2.6-kvm-mask-notifiers.patch
 Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch
-
-Patch9304: linux-2.6-kvm-skip-pit-check.patch
+Patch9303: linux-2.6-kvm-skip-pit-check.patch
+Patch9304: linux-2.6-xen-check-for-nx-support.patch
 
 Patch9400: pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch
 
@@ -1387,6 +1387,7 @@
 ApplyPatch linux-2.6-kvm-mask-notifiers.patch
 ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
 ApplyPatch linux-2.6-kvm-skip-pit-check.patch
+ApplyPatch linux-2.6-xen-check-for-nx-support.patch
 
 ApplyPatch pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch
 
@@ -1975,6 +1976,9 @@
 # and build.
 
 %changelog
+* Sun Apr 19 2009 Mark McLoughlin <markmc at redhat.com> - 2.6.29.1-101
+- Fix xen boot on machines without NX support (#492523)
+
 * Sat Apr 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.1-100
 - pat-remove-page-granularity-tracking-for-vm_insert_pfn_maps.patch:
    Fix the spew of "Xorg:3254 freeing invalid memtype" messages.