---

yaml --- r: 350175 b: refs/heads/master c: 36dfbbf h: refs/heads/master i: 350173: 0bf507b 350171: 1382f9c 350167: 65040f5 350159: 85f24f6 350143: 3546d2e v: v3
git-mirror · Feb 15, 2013 · 0f5dcda · 0f5dcda
1 parent e841241
commit 0f5dcda
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6c42c295e071dd74a66b5a9fcf4f44049888ed8
+refs/heads/master: 36dfbbf136db0d645bacfd42ce7d9d6928ea532d
diff --git a/trunk/arch/x86/vdso/vclock_gettime.c b/trunk/arch/x86/vdso/vclock_gettime.c
@@ -60,7 +60,7 @@ notrace static cycle_t vread_tsc(void)
 
 static notrace cycle_t vread_hpet(void)
 {
-	return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
+	return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + HPET_COUNTER);
 }
 
 #ifdef CONFIG_PARAVIRT_CLOCK