Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

[firefly-linux-kernel-4.4.55.git] / arch / x86 / xen / enlighten.c

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 79f97383cde3be99da33f092c7604876be896dab..b8e45f164e2acc360bcc5c380a864a635761f134 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1092,10 +1092,8 @@ 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
+       x86_configure_nx();
 
        xen_setup_features();