Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a6ddd5f authored by Alok Kataria's avatar Alok Kataria Committed by Ingo Molnar
Browse files

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: default avatarAlok N Kataria <akataria@vmware.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9482ac6e

arch/x86/kernel/setup.c

+8 −8
Original line number Diff line number Diff line
@@ -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();