[Xen-changelog] [xen-unstable] x86/time: verify_tsc_reliability() can be run as a generic initcall.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1316274296 -3600
# Node ID 994b5b125c31dd243e412aa568a0a6eb0d6436e9
# Parent  3af7c715a79dc20a63b63d84727d1cf14a422ab8
x86/time: verify_tsc_reliability() can be run as a generic initcall.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 3af7c715a79d -r 994b5b125c31 xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c      Sat Sep 17 16:27:36 2011 +0100
+++ b/xen/arch/x86/setup.c      Sat Sep 17 16:44:56 2011 +0100
@@ -1292,11 +1292,8 @@
     printk("Brought up %ld CPUs\n", (long)num_online_cpus());
     smp_cpus_done();
 
-    verify_tsc_reliability();
-
     do_initcalls();
 
-
     if ( opt_watchdog ) 
         watchdog_setup();
 
diff -r 3af7c715a79d -r 994b5b125c31 xen/arch/x86/time.c
--- a/xen/arch/x86/time.c       Sat Sep 17 16:27:36 2011 +0100
+++ b/xen/arch/x86/time.c       Sat Sep 17 16:44:56 2011 +0100
@@ -1451,7 +1451,7 @@
 }
 
 /* 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 @@
             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 -r 3af7c715a79d -r 994b5b125c31 xen/include/xen/time.h
--- a/xen/include/xen/time.h    Sat Sep 17 16:27:36 2011 +0100
+++ b/xen/include/xen/time.h    Sat Sep 17 16:44:56 2011 +0100
@@ -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);
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog