From c44e99dc6aace7e1899dc7361e7ec88fb893a464 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 26 May 2011 13:17:35 +0200 Subject: [PATCH] --- yaml --- r: 251986 b: refs/heads/master c: e9d35946c84c44e33e007123d3d595ccbd21d1a4 h: refs/heads/master 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 bfa1bdf7f317..be05970054b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 973aa8181e10050809b56ecbaadd01495766a19e +refs/heads/master: e9d35946c84c44e33e007123d3d595ccbd21d1a4 diff --git a/trunk/arch/x86/vdso/vclock_gettime.c b/trunk/arch/x86/vdso/vclock_gettime.c index a69929e8bfdb..a724905fdae7 100644 --- a/trunk/arch/x86/vdso/vclock_gettime.c +++ b/trunk/arch/x86/vdso/vclock_gettime.c @@ -175,8 +175,8 @@ static __always_inline long time_syscall(long *t) notrace time_t __vdso_time(time_t *t) { - unsigned seq; time_t result; + if (unlikely(!VVAR(vsyscall_gtod_data).sysctl_enabled)) return time_syscall(t);