Messages in this thread Patch in this message | | | Subject | x86: Fix VMI for early params...for mainline | From | Alok Kataria <> | Date | Thu, 21 Aug 2008 11:32:26 -0700 |
| |
While fixing a recent breakage in VMI on the recent x86 tree, I noticed that vmi specific kernel commandline parameters were broken. Below is the fix.
Please note this needs to go into the mainline tree.
-- x86: Fix VMI for early params
From: Alok N Kataria <akataria@vmware.com>
In a recent commit 31343d8a5079cda57ffd539fcf4f00cea344fe98, 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> Cc: Zachary Amsden <zach@vmware.com>
---
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 d2019ef..7c34c2b 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -607,14 +607,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; @@ -694,6 +686,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();
| |