Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 169995
b: refs/heads/master
c: 9b3660a
h: refs/heads/master
i:
  169993: 884f021
  169991: 71a030c
v: v3
  • Loading branch information
Mike Travis authored and Ingo Molnar committed Nov 26, 2009
1 parent 04e256b commit aacf77c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 67f2de0bf9141dd9fe9189d0caaa28d7ad21a523
refs/heads/master: 9b3660a55a9052518c91cc7c62d89e22f3f6f490
13 changes: 7 additions & 6 deletions trunk/arch/x86/kernel/tsc_sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,12 @@ void __cpuinit check_tsc_sync_source(int cpu)
return;

if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE)) {
printk_once(KERN_INFO "Skipping synchronization checks as TSC is reliable.\n");
if (cpu == (nr_cpu_ids-1) || system_state != SYSTEM_BOOTING)
pr_info(
"Skipped synchronization checks as TSC is reliable.\n");
return;
}

pr_info("checking TSC synchronization [CPU#%d -> CPU#%d]:",
smp_processor_id(), cpu);

/*
* Reset it - in case this is a second bootup:
*/
Expand All @@ -142,12 +141,14 @@ void __cpuinit check_tsc_sync_source(int cpu)
cpu_relax();

if (nr_warps) {
printk("\n");
pr_warning("TSC synchronization [CPU#%d -> CPU#%d]:\n",
smp_processor_id(), cpu);
pr_warning("Measured %Ld cycles TSC warp between CPUs, "
"turning off TSC clock.\n", max_warp);
mark_tsc_unstable("check_tsc_sync_source failed");
} else {
printk(" passed.\n");
pr_debug("TSC synchronization [CPU#%d -> CPU#%d]: passed\n",
smp_processor_id(), cpu);
}

/*
Expand Down

0 comments on commit aacf77c

Please sign in to comment.