diff options
| author | Horms <horms@verge.net.au> | 2007-07-25 16:06:25 +0900 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-07-25 11:12:47 -0700 |
| commit | a07ee86205808d36973440e68c7277f9ed63b87f (patch) | |
| tree | 183d1d592c42fce8081a40a881300e4cf304ec56 /arch/ia64/kernel/setup.c | |
| parent | 6ffbc82351c62eeeeaeb9e817ddf93049353493d (diff) | |
[IA64] Ensure that machvec is set up takes place before serial console
Parse the machvec command line option outside of the early_param()
so that ia64_mv is set before any console intialisation that
may result from early_param parsing.
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index cf06fe79904..7cecd296420 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(); |