Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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>
authored by Alok Kataria and committed by Ingo Molnar 3a6ddd5f 9482ac6e
+8
-8
arch/x86/kernel/setup.c
+8
-8
arch/x86/kernel/setup.c
···
604
early_cpu_init();
605
early_ioremap_init();
606
607
-
#if defined(CONFIG_VMI) && defined(CONFIG_X86_32)
608
-
/*
609
-
* Must be before kernel pagetables are setup
610
-
* or fixmap area is touched.
611
-
*/
612
-
vmi_init();
613
-
#endif
614
-
615
ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
616
screen_info = boot_params.screen_info;
617
edid_info = boot_params.edid_info;
···
669
*cmdline_p = command_line;
670
671
parse_early_param();
672
673
/* after early param, so could get panic from serial */
674
reserve_early_setup_data();
···
604
early_cpu_init();
605
early_ioremap_init();
606
607
ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
608
screen_info = boot_params.screen_info;
609
edid_info = boot_params.edid_info;
···
677
*cmdline_p = command_line;
678
679
parse_early_param();
680
+
681
+
#if defined(CONFIG_VMI) && defined(CONFIG_X86_32)
682
+
/*
683
+
* Must be before kernel pagetables are setup
684
+
* or fixmap area is touched.
685
+
*/
686
+
vmi_init();
687
+
#endif
688
689
/* after early param, so could get panic from serial */
690
reserve_early_setup_data();