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

[sfrench/cifs-2.6.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 4062f15bfbddf5319d174c3ea3b0d12bf1daf364..a2bb18e02839489dcbf9dbc1e3d348f5fb176c34 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -958,13 +958,11 @@ void __init setup_arch(char **cmdline_p)
        initmem_init();
        memblock_find_dma_reserve();
 
-#ifdef CONFIG_KVM_CLOCK
+#ifdef CONFIG_KVM_GUEST
        kvmclock_init();
 #endif
 
-       x86_init.paging.pagetable_setup_start(swapper_pg_dir);
-       paging_init();
-       x86_init.paging.pagetable_setup_done(swapper_pg_dir);
+       x86_init.paging.pagetable_init();
 
        if (boot_cpu_data.cpuid_level >= 0) {
                /* A CPU has %cr4 if and only if it has CPUID */