|
@@ -712,21 +712,6 @@ void __init setup_arch(char **cmdline_p)
|
|
|
printk(KERN_INFO "Command line: %s\n", boot_command_line);
|
|
|
#endif
|
|
|
|
|
|
- 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 */
|
|
|
vmi_init();
|
|
|
|
|
@@ -809,6 +794,21 @@ void __init setup_arch(char **cmdline_p)
|
|
|
#endif
|
|
|
#endif
|
|
|
|
|
|
+ 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();
|
|
|
+
|
|
|
#ifdef CONFIG_X86_64
|
|
|
check_efer();
|
|
|
#endif
|