From 5fe38d73478005a8903f27a6ebbe77d5dcd14024 Mon Sep 17 00:00:00 2001 From: john stultz Date: Thu, 12 Feb 2009 18:48:53 -0800 Subject: [PATCH] --- yaml --- r: 131467 b: refs/heads/master c: b13e24644c138d0ddbc451403c30a96b09bfd556 h: refs/heads/master i: 131465: a1cc4565430f4754aaa11d55faef7d2eb5e56058 131463: bf649895ce847e4a198cf194cc1e761edb083721 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/hpet.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 42805b26dbc1..e3dcb8bf925e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ad9de6ac83bd825996d2de98c92e0f425c31050 +refs/heads/master: b13e24644c138d0ddbc451403c30a96b09bfd556 diff --git a/trunk/arch/x86/kernel/hpet.c b/trunk/arch/x86/kernel/hpet.c index 64d5ad0b8add..5c8da2c2c185 100644 --- a/trunk/arch/x86/kernel/hpet.c +++ b/trunk/arch/x86/kernel/hpet.c @@ -269,6 +269,8 @@ static void hpet_set_mode(enum clock_event_mode mode, now = hpet_readl(HPET_COUNTER); cmp = now + (unsigned long) delta; cfg = hpet_readl(HPET_Tn_CFG(timer)); + /* Make sure we use edge triggered interrupts */ + cfg &= ~HPET_TN_LEVEL; cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC | HPET_TN_SETVAL | HPET_TN_32BIT; hpet_writel(cfg, HPET_Tn_CFG(timer));