From 3dbbbc4969dc742ba1ed08108df034aec37485b7 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 30 Jan 2008 13:33:23 +0100 Subject: [PATCH] --- yaml --- r: 80355 b: refs/heads/master c: df43510b18b8439465b4b58556f0495b5f5d771e h: refs/heads/master i: 80353: b498bb2cdb95879cb94038a0be8b1d87ef9c2682 80351: efd00d8ae55d16c097c942516c5adfd5f83b99b6 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/tsc_sync.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bb69f9542628..86060931305d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ade1af77129dea6e335b525ed3be3b846bc1ec13 +refs/heads/master: df43510b18b8439465b4b58556f0495b5f5d771e diff --git a/trunk/arch/x86/kernel/tsc_sync.c b/trunk/arch/x86/kernel/tsc_sync.c index ace340524c01..7110078f242c 100644 --- a/trunk/arch/x86/kernel/tsc_sync.c +++ b/trunk/arch/x86/kernel/tsc_sync.c @@ -67,12 +67,12 @@ static __cpuinit void check_tsc_warp(void) /* * Be nice every now and then (and also check whether - * measurement is done [we also insert a 100 million + * measurement is done [we also insert a 10 million * loops safety exit, so we dont lock up in case the * TSC readout is totally broken]): */ if (unlikely(!(i & 7))) { - if (now > end || i > 100000000) + if (now > end || i > 10000000) break; cpu_relax(); touch_nmi_watchdog();