Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[linux-2.6.git] / arch / x86 / kernel / setup_64.c

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 2f5c488aad0b92192c0a38882e824b3d405e7829..22c14e21c97c435a8d172d8f23159738bf0dbe2f 100644 (file)
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -44,6 +44,7 @@
 #include <linux/sort.h>
 #include <linux/uaccess.h>
 #include <linux/init_ohci1394_dma.h>
 #include <linux/sort.h>
 #include <linux/uaccess.h>
 #include <linux/init_ohci1394_dma.h>

+#include <linux/kvm_para.h>

 
 #include <asm/mtrr.h>
 #include <asm/uaccess.h>
 
 #include <asm/mtrr.h>
 #include <asm/uaccess.h>


@@ -398,6 +399,10 @@ void __init setup_arch(char **cmdline_p)
 
        io_delay_init();
 
 
        io_delay_init();
 

+#ifdef CONFIG_KVM_CLOCK
+       kvmclock_init();
+#endif
+

 #ifdef CONFIG_SMP
        /* setup to use the early static init tables during kernel startup */
        x86_cpu_to_apicid_early_ptr = (void *)x86_cpu_to_apicid_init;
 #ifdef CONFIG_SMP
        /* setup to use the early static init tables during kernel startup */
        x86_cpu_to_apicid_early_ptr = (void *)x86_cpu_to_apicid_init;


@@ -502,6 +507,8 @@ void __init setup_arch(char **cmdline_p)
        init_apic_mappings();
        ioapic_init_mappings();
 
        init_apic_mappings();
        ioapic_init_mappings();
 

+       kvm_guest_init();
+

        /*
         * We trust e820 completely. No explicit ROM probing in memory.
         */
        /*
         * We trust e820 completely. No explicit ROM probing in memory.
         */