1 files changed, 2 insertions, 6 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 0a6e94ab8339..23b7f46bf843 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -787,21 +787,17 @@ void __init setup_arch(char **cmdline_p)
         strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
         *cmdline_p = command_line;
 
-#ifdef CONFIG_X86_64
         /*
          * Must call this twice: Once just to detect whether hardware doesn't
          * support NX (so that the early EHCI debug console setup can safely
          * call set_fixmap(), and then again after parsing early parameters to
          * honor the respective command line option.
          */
-        check_efer();
-#endif
+        x86_configure_nx();
 
         parse_early_param();
 
-#ifdef CONFIG_X86_64
-        check_efer();
-#endif
+        x86_configure_nx();
 
         /* Must be before kernel pagetables are setup */
         vmi_activate();