From 8b66fecbb36182ec0e39754a39806a87c7c4b7f6 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Fri, 27 Mar 2009 11:29:02 -0700
Subject: [PATCH] --- yaml --- r: 145831 b: refs/heads/master c:
 707ebbc81c61eb480d8a51ca61e355e240df1d32 h: refs/heads/master i:   145829:
 832b6c04f3749c2fe9faf493dba558108e2d540b   145827:
 a14d25e3e9ab35a09597189cff62d357738345ea   145823:
 c51f7e3096e317239ee4225ffcaf8c68fa6f682a v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/xen/enlighten.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c909ab86f7f2..27e223e76812 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e6fcf840e11ceff8a656a678c6e4b0560a98e08
+refs/heads/master: 707ebbc81c61eb480d8a51ca61e355e240df1d32
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index da33e0c5870d..80f4c5343495 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/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>
@@ -912,7 +913,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)
 {
@@ -980,6 +980,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];