From 4d2721c0ff45d8f4498e6d7ef1e3a3d9bc4a229c Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Thu, 10 Jul 2008 14:01:47 -0300 Subject: [PATCH] --- yaml --- r: 100111 b: refs/heads/master c: e54afe38630e3b577968428f48ed8ef1e13a2a15 h: refs/heads/master i: 100109: 3264b9008ad147db715aebcfc1f5867ff8270038 100107: 5d625d6449e95b6fad08258b25c99296b235c2a7 100103: f051e78450e5c895358b4d265773e4fd75134897 100095: 982d6d68b6256addcc18f28b5946ef6727ce75fd v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/tsc.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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;