From: Stefani Seibold <stefani@seibold.net>
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
x86@kernel.org, tglx@linutronix.de, mingo@redhat.com,
hpa@zytor.com, ak@linux.intel.com, aarcange@redhat.com,
john.stultz@linaro.org, luto@amacapital.net, xemul@parallels.com,
gorcunov@openvz.org, andriy.shevchenko@linux.intel.com
Cc: Martin.Runge@rohde-schwarz.com, Andreas.Brief@rohde-schwarz.com,
Stefani Seibold <stefani@seibold.net>
Subject: [PATCH v19 06/10] cleanup __vdso_gettimeofday
Date: Mon, 17 Feb 2014 11:03:40 +0100 [thread overview]
Message-ID: <1392631424-32205-7-git-send-email-stefani@seibold.net> (raw)
In-Reply-To: <1392631424-32205-1-git-send-email-stefani@seibold.net>
This patch do a little cleanup for the __vdso_gettimeofday() function.
It kick out an unneeded ret local variable and makes the code faster if
only the timezone is needed.
Signed-off-by: Stefani Seibold <stefani@seibold.net>
---
arch/x86/vdso/vclock_gettime.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
index 743f277..09dae4a 100644
--- 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 *)
--
1.8.5.5
next prev parent reply other threads:[~2014-02-17 10:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-17 10:03 [PATCH v19 00/10] Add 32 bit VDSO time function support Stefani Seibold
2014-02-17 10:03 ` [PATCH v19 01/10] Make vsyscall_gtod_data handling x86 generic Stefani Seibold
2014-02-17 10:03 ` [PATCH v19 02/10] Add new func _install_special_mapping() to mmap.c Stefani Seibold
2014-02-17 10:03 ` [PATCH v19 03/10] revamp vclock_gettime.c Stefani Seibold
2014-02-17 10:03 ` [PATCH v19 04/10] vclock_gettime.c __vdso_clock_gettime cleanup Stefani Seibold
2014-02-17 10:03 ` [PATCH v19 05/10] replace VVAR(vsyscall_gtod_data) by gtod macro Stefani Seibold
2014-02-17 10:03 ` Stefani Seibold [this message]
2014-02-17 10:03 ` [PATCH v19 07/10] introduce VVAR marco for vdso32 Stefani Seibold
2014-02-17 10:03 ` [PATCH v19 08/10] Add 32 bit VDSO time support for 32 bit kernel Stefani Seibold
2014-02-17 15:58 ` [tip:x86/vdso] x86, vdso: Add 32-bit VDSO time support for the 32-bit kernel tip-bot for Stefani Seibold
2014-02-17 10:03 ` [PATCH v19 09/10] Add 32 bit VDSO time support for 64 bit kernel Stefani Seibold
2014-02-17 15:58 ` [tip:x86/vdso] x86, vdso: Add 32-bit VDSO time support for the 64-bit kernel tip-bot for Stefani Seibold
2014-02-17 19:03 ` tip-bot for Stefani Seibold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1392631424-32205-7-git-send-email-stefani@seibold.net \
--to=stefani@seibold.net \
--cc=Andreas.Brief@rohde-schwarz.com \
--cc=Martin.Runge@rohde-schwarz.com \
--cc=aarcange@redhat.com \
--cc=ak@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=gorcunov@openvz.org \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=xemul@parallels.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).