1 files changed, 10 insertions, 0 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 02643cc3bf26..eb1f1e6e52b0 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -714,6 +714,16 @@ 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
+
         parse_early_param();
 
         /* VMI may relocate the fixmap; do this before touching ioremap area */