summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-07-10 14:01:47 -0300
committerIngo Molnar <mingo@elte.hu>2008-07-10 19:47:55 +0200
commite54afe38630e3b577968428f48ed8ef1e13a2a15 (patch)
treeb8e9ae0b981759a4486cbcd3afcaaca606a5e1e1
parentf87f38ec5a5157aa39f44f6018dc58ea62f8e0e2 (diff)
x86: remove duplicate call to use_tsc_delay
Integration generated a duplicate call to use_tsc_delay. Particularly, the one that is done before we check for general tsc usability seems wrong. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/tsc.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 4a775d001957..3c36f92160c9 100644
--- a/arch/x86/kernel/tsc.c
+++ b/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;