Merge branch 'linus' into x86/delay

Conflicts:

	arch/x86/kernel/tsc_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 8 insertions, 10 deletions

diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c
index 048baab77268..0065426f1511 100644
--- a/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
@@ -15,7 +15,10 @@
 
 #include "mach_timer.h"
 
-static int tsc_disabled;
+/* native_sched_clock() is called before tsc_init(), so
+   we must start with the TSC soft disabled to prevent
+   erroneous rdtsc usage on !cpu_has_tsc processors */
+static int tsc_disabled = -1;
 
 /*
  * On some systems the TSC frequency does not
@@ -404,22 +407,14 @@ void __init tsc_init(void)
         int cpu;
         u64 lpj;
 
-        if (!cpu_has_tsc || tsc_disabled) {
-                /* Disable the TSC in case of !cpu_has_tsc */
-                tsc_disabled = 1;
+        if (!cpu_has_tsc || tsc_disabled > 0)
                 return;
-        }
 
         cpu_khz = calculate_cpu_khz();
         tsc_khz = cpu_khz;
 
         if (!cpu_khz) {
                 mark_tsc_unstable("could not calculate TSC khz");
-                /*
-                 * We need to disable the TSC completely in this case
-                 * to prevent sched_clock() from using it.
-                 */
-                tsc_disabled = 1;
                 return;
         }
 
@@ -427,6 +422,9 @@ void __init tsc_init(void)
         do_div(lpj, HZ);
         lpj_fine = lpj;
 
+        /* now allow native_sched_clock() to use rdtsc */
+        tsc_disabled = 0;
+
         printk("Detected %lu.%03lu MHz processor.\n",
                                 (unsigned long)cpu_khz / 1000,
                                 (unsigned long)cpu_khz % 1000);