x86, vdso: Cleanup __vdso_gettimeofday()

This patch cleans up the __vdso_gettimeofday() function a little.

It kicks out an unneeded ret local variable and makes the code faster
if only the timezone is needed (an admittedly rare case.)

Reviewed-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Stefani Seibold <stefani@seibold.net>
Link: http://lkml.kernel.org/r/1395094933-14252-7-git-send-email-stefani@seibold.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
index 743f27774b73c362c49d90e010a47073c30e96b8..09dae4a1c6dc605a1630357e5386cfcc44088a85 100644 (file)
--- a/arch/x86/vdso/vclock_gettime.c
+++ b/arch/x86/vdso/vclock_gettime.c
@@ -259,13 +259,12 @@ int clock_gettime(clockid_t, struct timespec *)
 
 notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
 {
-       long ret = VCLOCK_NONE;
-
        if (likely(tv != NULL)) {
                BUILD_BUG_ON(offsetof(struct timeval, tv_usec) !=
                             offsetof(struct timespec, tv_nsec) ||
                             sizeof(*tv) != sizeof(struct timespec));
-               ret = do_realtime((struct timespec *)tv);
+               if (unlikely(do_realtime((struct timespec *)tv) == VCLOCK_NONE))
+                       return vdso_fallback_gtod(tv, tz);
                tv->tv_usec /= 1000;
        }
        if (unlikely(tz != NULL)) {
@@ -274,8 +273,6 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
                tz->tz_dsttime = gtod->sys_tz.tz_dsttime;
        }
 
-       if (ret == VCLOCK_NONE)
-               return vdso_fallback_gtod(tv, tz);
        return 0;
 }
 int gettimeofday(struct timeval *, struct timezone *)