Merge branch 'linus' into x86/delay

Conflicts:

	arch/x86/kernel/tsc_32.c

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

diff --cc arch/x86/kernel/tsc_32.c
index 048baab7726897c8e8716d13a034dbdfbf9cf213,65b70637ad9796d8256b9305c4dfd4ed3c378e6d..0065426f1511a056f589375382ba88e256f2380a
--- 1/arch/x86/kernel/tsc_32.c
--- 2/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
@@@ -402,13 -404,9 +405,10 @@@ static inline void check_geode_tsc_reli
  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;
@@@ -418,15 -416,9 +418,13 @@@
                return;
        }
  
 +      lpj = ((u64)tsc_khz * 1000);
 +      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);