提交 727cae00 编写于 作者: J Jiufei Xue 提交者: Joseph Qi

Revert "x86/tsc: Prepare warp test for TSC adjustment"

This reverts commit 76d3b851.

The returned value for check_tsc_warp() is useless now, remove it.
Signed-off-by: NJiufei Xue <jiufei.xue@linux.alibaba.com>
Reviewed-by: NJoseph Qi <joseph.qi@linux.alibaba.com>
上级 1a33c395
...@@ -222,9 +222,9 @@ static int random_warps; ...@@ -222,9 +222,9 @@ static int random_warps;
* TSC-warp measurement loop running on both CPUs. This is not called * TSC-warp measurement loop running on both CPUs. This is not called
* if there is no TSC. * if there is no TSC.
*/ */
static cycles_t check_tsc_warp(unsigned int timeout) static void check_tsc_warp(unsigned int timeout)
{ {
cycles_t start, now, prev, end, cur_max_warp = 0; cycles_t start, now, prev, end;
int i, cur_warps = 0; int i, cur_warps = 0;
start = rdtsc_ordered(); start = rdtsc_ordered();
...@@ -265,7 +265,6 @@ static cycles_t check_tsc_warp(unsigned int timeout) ...@@ -265,7 +265,6 @@ static cycles_t check_tsc_warp(unsigned int timeout)
if (unlikely(prev > now)) { if (unlikely(prev > now)) {
arch_spin_lock(&sync_lock); arch_spin_lock(&sync_lock);
max_warp = max(max_warp, prev - now); max_warp = max(max_warp, prev - now);
cur_max_warp = max_warp;
/* /*
* Check whether this bounces back and forth. Only * Check whether this bounces back and forth. Only
* one CPU should observe time going backwards. * one CPU should observe time going backwards.
...@@ -280,7 +279,6 @@ static cycles_t check_tsc_warp(unsigned int timeout) ...@@ -280,7 +279,6 @@ static cycles_t check_tsc_warp(unsigned int timeout)
WARN(!(now-start), WARN(!(now-start),
"Warning: zero tsc calibration delta: %Ld [max: %Ld]\n", "Warning: zero tsc calibration delta: %Ld [max: %Ld]\n",
now-start, end-start); now-start, end-start);
return cur_max_warp;
} }
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册