iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: setup_arch 32bit move kvm_guest_init later

Browse Source 
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-06-23 19:55:05 -07:00 committed by Ingo Molnar
parent 9a2e593026
commit 295deae401
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/kernel/setup_32.c
View File

@ -482,8 +482,6 @@ void __init setup_arch(char **cmdline_p)
*/ */
vmi_init(); vmi_init();
#endif #endif
kvm_guest_init();
/* /*
* NOTE: before this point _nobody_ is allowed to allocate * NOTE: before this point _nobody_ is allowed to allocate
* any memory using the bootmem allocator. Although the * any memory using the bootmem allocator. Although the
@ -511,9 +509,15 @@ void __init setup_arch(char **cmdline_p)
early_quirks(); early_quirks();
/*
* Read APIC and some other early information from ACPI tables.
*/
acpi_boot_init(); acpi_boot_init();
#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS) #if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
/*
* get boot-time SMP configuration:
*/
if (smp_found_config) if (smp_found_config)
get_smp_config(); get_smp_config();
#endif #endif
@ -523,6 +527,7 @@ void __init setup_arch(char **cmdline_p)
"CONFIG_X86_PC cannot handle it.\nUse " "CONFIG_X86_PC cannot handle it.\nUse "
"CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n"); "CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n");
#endif #endif
kvm_guest_init();
e820_reserve_resources(); e820_reserve_resources();
e820_mark_nosave_regions(max_low_pfn); e820_mark_nosave_regions(max_low_pfn);