x86/time: verify_tsc_reliability() can be run as a generic initcall.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 5e455668709121c2a6916f1a0b068e1a0f59db89..83d59025d128b908370c44479ace0a5dc7de82fd 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1292,11 +1292,8 @@ void __init __start_xen(unsigned long mbi_p)
     printk("Brought up %ld CPUs\n", (long)num_online_cpus());
     smp_cpus_done();
 
-    verify_tsc_reliability();
-
     do_initcalls();
 
-
     if ( opt_watchdog ) 
         watchdog_setup();
 

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 61320c4900f98aa7393269a6dacf7221570fc0ca..77be0c396b7af0ed795cae51735e0afecbb6bfd5 100644 (file)
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -1451,7 +1451,7 @@ static void __init tsc_check_writability(void)
 }
 
 /* Late init function, after all cpus have booted */
-void __init verify_tsc_reliability(void)
+static int __init verify_tsc_reliability(void)
 {
     if ( boot_cpu_has(X86_FEATURE_TSC_RELIABLE) )
     {
@@ -1469,7 +1469,10 @@ void __init verify_tsc_reliability(void)
             setup_clear_cpu_cap(X86_FEATURE_TSC_RELIABLE);
         }
     }
+
+    return 0;
 }
+__initcall(verify_tsc_reliability);
 
 /* Late init function (after interrupts are enabled). */
 int __init init_xen_time(void)

diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h
index 068c74215698f7a631bd369fa9115bf53f3f1e0c..a19434079ccbb47c96bab92f2349c4834328f849 100644 (file)
--- a/xen/include/xen/time.h
+++ b/xen/include/xen/time.h
@@ -11,7 +11,6 @@
 #include <xen/types.h>
 #include <public/xen.h>
 
-extern void verify_tsc_reliability(void);
 extern int init_xen_time(void);
 extern void cstate_restore_tsc(void);