diff --git a/[refs] b/[refs] index aa5bc7b819db..14173945651d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e82f64e5bb0648a13630d752c35be1e7bd8bab96 +refs/heads/master: 8180a550284bf2c8e13414082fc20b8983c2c401 diff --git a/trunk/arch/x86_64/kernel/hpet.c b/trunk/arch/x86_64/kernel/hpet.c index b8286968662d..6b460402d504 100644 --- a/trunk/arch/x86_64/kernel/hpet.c +++ b/trunk/arch/x86_64/kernel/hpet.c @@ -190,7 +190,7 @@ int hpet_reenable(void) */ #define TICK_COUNT 100000000 -#define TICK_MIN 5000 +#define SMI_THRESHOLD 50000 #define MAX_TRIES 5 /* @@ -205,7 +205,7 @@ static void __init read_hpet_tsc(int *hpet, int *tsc) tsc1 = get_cycles_sync(); hpet1 = hpet_readl(HPET_COUNTER); tsc2 = get_cycles_sync(); - if (tsc2 - tsc1 > TICK_MIN) + if ((tsc2 - tsc1) < SMI_THRESHOLD) break; } *hpet = hpet1;