diff --git a/[refs] b/[refs] index 84117196b0f9..e5dc595f0158 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f87f38ec5a5157aa39f44f6018dc58ea62f8e0e2 +refs/heads/master: e54afe38630e3b577968428f48ed8ef1e13a2a15 diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c index 4a775d001957..3c36f92160c9 100644 --- a/trunk/arch/x86/kernel/tsc.c +++ b/trunk/arch/x86/kernel/tsc.c @@ -513,7 +513,6 @@ void __init tsc_init(void) */ for_each_possible_cpu(cpu) set_cyc2ns_scale(cpu_khz, cpu); - use_tsc_delay(); if (tsc_disabled > 0) return;