1 files changed, 8 insertions, 3 deletions

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index cf06fe799041..7cecd2964200 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -491,12 +491,17 @@ setup_arch (char **cmdline_p)
         efi_init();
         io_port_init();
 
-        parse_early_param();
-
 #ifdef CONFIG_IA64_GENERIC
-        machvec_init(NULL);
+        /* machvec needs to be parsed from the command line
+         * before parse_early_param() is called to ensure
+         * that ia64_mv is initialised before any command line
+         * settings may cause console setup to occur
+         */
+        machvec_init_from_cmdline(*cmdline_p);
 #endif
 
+        parse_early_param();
+
         if (early_console_setup(*cmdline_p) == 0)
                 mark_bsp_online();