From 8b6051aa0f054082c4075f51bfbc294377bf0c94 Mon Sep 17 00:00:00 2001 From: Mike Galbraith Date: Wed, 30 Jan 2008 13:30:04 +0100 Subject: [PATCH] --- yaml --- r: 79706 b: refs/heads/master c: 4c6b8b4d62fb4cb843c32db71e0a8301039908f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/tsc_sync.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 73ccd5786a8b..c7c12f1d27cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c9c9bec0589be696c70c5efb448b17d5ab720e2 +refs/heads/master: 4c6b8b4d62fb4cb843c32db71e0a8301039908f3 diff --git a/trunk/arch/x86/kernel/tsc_sync.c b/trunk/arch/x86/kernel/tsc_sync.c index 9125efe66a06..05d8f25de6ae 100644 --- a/trunk/arch/x86/kernel/tsc_sync.c +++ b/trunk/arch/x86/kernel/tsc_sync.c @@ -129,23 +129,23 @@ void __cpuinit check_tsc_sync_source(int cpu) while (atomic_read(&stop_count) != cpus-1) cpu_relax(); - /* - * Reset it - just in case we boot another CPU later: - */ - atomic_set(&start_count, 0); - if (nr_warps) { printk("\n"); printk(KERN_WARNING "Measured %Ld cycles TSC warp between CPUs," " turning off TSC clock.\n", max_warp); mark_tsc_unstable("check_tsc_sync_source failed"); - nr_warps = 0; - max_warp = 0; - last_tsc = 0; } else { printk(" passed.\n"); } + /* + * Reset it - just in case we boot another CPU later: + */ + atomic_set(&start_count, 0); + nr_warps = 0; + max_warp = 0; + last_tsc = 0; + /* * Let the target continue with the bootup: */