2 files changed, 6 insertions, 2 deletions

diff --git a/arch/x86/entry/vsyscall/vsyscall_gtod.c b/arch/x86/entry/vsyscall/vsyscall_gtod.c
index 31b9e5e0cfdf..cfcdba082feb 100644
--- a/arch/x86/entry/vsyscall/vsyscall_gtod.c
+++ b/arch/x86/entry/vsyscall/vsyscall_gtod.c
@@ -51,6 +51,10 @@ void update_vsyscall(struct timekeeper *tk)
         base->sec = tk->xtime_sec;
         base->nsec = tk->tkr_mono.xtime_nsec;
 
+        base = &vdata->basetime[CLOCK_TAI];
+        base->sec = tk->xtime_sec + (s64)tk->tai_offset;
+        base->nsec = tk->tkr_mono.xtime_nsec;
+
         base = &vdata->basetime[CLOCK_MONOTONIC];
         base->sec = tk->xtime_sec + tk->wall_to_monotonic.tv_sec;
         nsec = tk->tkr_mono.xtime_nsec;
diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
index 10e534a1a51a..d17b092b9f1b 100644
--- a/arch/x86/include/asm/vgtod.h
+++ b/arch/x86/include/asm/vgtod.h
@@ -18,8 +18,8 @@ struct vgtod_ts {
         u64             nsec;
 };
 
-#define VGTOD_BASES     (CLOCK_MONOTONIC_COARSE + 1)
-#define VGTOD_HRES      (BIT(CLOCK_REALTIME) | BIT(CLOCK_MONOTONIC))
+#define VGTOD_BASES     (CLOCK_TAI + 1)
+#define VGTOD_HRES      (BIT(CLOCK_REALTIME) | BIT(CLOCK_MONOTONIC) | BIT(CLOCK_TAI))
 #define VGTOD_COARSE    (BIT(CLOCK_REALTIME_COARSE) | BIT(CLOCK_MONOTONIC_COARSE))
 
 /*