diff options
| author |   Alok Kataria <akataria@vmware.com> | 2008-08-21 11:32:26 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-08-22 08:01:54 +0200 |
| commit | 3a6ddd5f18405ca92e004416af8ed44b9c9783d7 (patch) | |
| tree | 3aace40b4beb788dfc44234f7a834e48090a1c16 /arch/x86 | |
| parent | x86: fix two modpost warnings in mm/init_64.c (diff) | |
| download | linux-dev-3a6ddd5f18405ca92e004416af8ed44b9c9783d7.tar.xz linux-dev-3a6ddd5f18405ca92e004416af8ed44b9c9783d7.zip | |
x86: fix VMI for early params
while fixing a different bug i moved the call to vmi_init before
early params could be parsed.
This broke the vmi specific commandline parameters.
Fix that, by moving vmi initialization after kernel has got a chance to
parse early parameters.
Signed-off-by: Alok N Kataria <akataria@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/setup.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index a4656adab53b..362d4e7f2d38 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -604,14 +604,6 @@ void __init setup_arch(char **cmdline_p) early_cpu_init(); early_ioremap_init(); -#if defined(CONFIG_VMI) && defined(CONFIG_X86_32) - /* - * Must be before kernel pagetables are setup - * or fixmap area is touched. - */ - vmi_init(); -#endif - ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev); screen_info = boot_params.screen_info; edid_info = boot_params.edid_info; @@ -678,6 +670,14 @@ void __init setup_arch(char **cmdline_p) parse_early_param(); +#if defined(CONFIG_VMI) && defined(CONFIG_X86_32) + /* + * Must be before kernel pagetables are setup + * or fixmap area is touched. + */ + vmi_init(); +#endif + /* after early param, so could get panic from serial */ reserve_early_setup_data(); |