x86/paravirt: call paravirt_pagetable_setup_{start, done}

[mirror_ubuntu-bionic-kernel.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 987b6fde3a99c51b5acfd6c0acbf69b866337bb2..8ce6a91ce1084ef00e97fe3fd1c2a7ef178f9bbf 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -819,7 +819,9 @@ void __init setup_arch(char **cmdline_p)
        vmi_init();
 #endif
 
+       paravirt_pagetable_setup_start(swapper_pg_dir);
        paging_init();
+       paravirt_pagetable_setup_done(swapper_pg_dir);
 
 #ifdef CONFIG_X86_64
        map_vsyscall();
@@ -849,6 +851,14 @@ void __init setup_arch(char **cmdline_p)
        init_cpu_to_node();
 #endif
 
+#ifdef CONFIG_X86_NUMAQ
+       /*
+        * need to check online nodes num, call it
+        * here before time_init/tsc_init
+        */
+       numaq_tsc_disable();
+#endif
+
        init_apic_mappings();
        ioapic_init_mappings();