lkml.org 
[lkml]   [2008]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] x86: setup_arch 32bit move kvm_guest_init later
Date

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

---
arch/x86/kernel/setup_32.c | 32 ++++++++++++++++++--------------
arch/x86/kernel/setup_64.c | 14 +++++++-------
2 files changed, 25 insertions(+), 21 deletions(-)
Index: linux-2.6/arch/x86/kernel/setup_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup_32.c
+++ linux-2.6/arch/x86/kernel/setup_32.c
@@ -488,8 +488,6 @@ void __init setup_arch(char **cmdline_p)
*/
vmi_init();
#endif
- kvm_guest_init();
-
/*
* NOTE: before this point _nobody_ is allowed to allocate
* any memory using the bootmem allocator. Although the
@@ -517,9 +515,15 @@ void __init setup_arch(char **cmdline_p)

early_quirks();

+ /*
+ * Read APIC and some other early information from ACPI tables.
+ */
acpi_boot_init();

#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
+ /*
+ * get boot-time SMP configuration:
+ */
if (smp_found_config)
get_smp_config();
#endif
@@ -529,6 +533,7 @@ void __init setup_arch(char **cmdline_p)
"CONFIG_X86_PC cannot handle it.\nUse "
"CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n");
#endif
+ kvm_guest_init();

e820_reserve_resources();
e820_mark_nosave_regions(max_low_pfn);

\
 
 \ /
  Last update: 2008-06-24 04:59    [from the cache]
©2003-2011 Jasper Spaans