From 0f5dcdaefd544c48ad27710adc4e3dd0753a0c0b Mon Sep 17 00:00:00 2001
From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Date: Fri, 15 Feb 2013 16:58:14 +0900
Subject: [PATCH] --- yaml --- r: 350175 b: refs/heads/master c:
 36dfbbf136db0d645bacfd42ce7d9d6928ea532d h: refs/heads/master i:   350173:
 0bf507b45ddbd5aba0df2112259507c8d09f34a1   350171:
 1382f9c51252c5ec91e6bb0c010fe26a0e1d0ed3   350167:
 65040f5cc8ad27b21005e01b25636a0c9631efda   350159:
 85f24f6c85435326b896987a9a9237bd86c1b22e   350143:
 3546d2ead1e44e7bbae3615245ba11e98d7baf46 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/vdso/vclock_gettime.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c8598ed6e685..2f971c620703 100644
--- 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
index 205ad328aa52..c74436e687bf 100644
--- 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