---

yaml
---
r: 145831
b: refs/heads/master
c: 707ebbc
h: refs/heads/master
i:
  145829: 832b6c0
  145827: a14d25e
  145823: c51f7e3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e6fcf840e11ceff8a656a678c6e4b0560a98e08
+refs/heads/master: 707ebbc81c61eb480d8a51ca61e355e240df1d32

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];