---

yaml --- r: 131467 b: refs/heads/master c: b13e246 h: refs/heads/master i: 131465: a1cc456 131463: bf64989 v: v3
git-mirror · Feb 13, 2009 · 5fe38d7 · 5fe38d7
1 parent ebb07ea
commit 5fe38d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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));