From 5f37a63a02fa17d91a9e9a5c8fbb6048b7264c8a Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Sun, 2 Nov 2008 16:04:20 +0000 Subject: [PATCH] --- yaml --- r: 118771 b: refs/heads/master c: 89d77a1eb60be916d85d9394bedbfa2037af89c5 h: refs/heads/master i: 118769: a8633c0b08cc0ca11ee52a037c33a235091117e7 118767: 944629794b0b3845929ad98e89e1fff381add883 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/hpet.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 69d85b403c96..91c986ce3e9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1de5b0854623d30d01d72cd4ea323eb5f39d1f16 +refs/heads/master: 89d77a1eb60be916d85d9394bedbfa2037af89c5 diff --git a/trunk/arch/x86/kernel/hpet.c b/trunk/arch/x86/kernel/hpet.c index f10f9461a43d..cfe6aa56f71b 100644 --- a/trunk/arch/x86/kernel/hpet.c +++ b/trunk/arch/x86/kernel/hpet.c @@ -322,7 +322,7 @@ static int hpet_next_event(unsigned long delta, * what we wrote hit the chip before we compare it to the * counter. */ - WARN_ON_ONCE((u32)hpet_readl(HPET_T0_CMP) != cnt); + WARN_ON_ONCE((u32)hpet_readl(HPET_Tn_CMP(timer)) != cnt); return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) >= 0 ? -ETIME : 0; }