git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
vsyscall.c
diff --git
a/arch/x86_64/kernel/vsyscall.c
b/arch/x86_64/kernel/vsyscall.c
index
f603037
..
9468fb2
100644
(file)
--- a/
arch/x86_64/kernel/vsyscall.c
+++ b/
arch/x86_64/kernel/vsyscall.c
@@
-107,7
+107,7
@@
static __always_inline long time_syscall(long *t)
int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)
{
int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)
{
- if (
!__sysctl_vsyscall
)
+ if (
unlikely(!__sysctl_vsyscall)
)
return gettimeofday(tv,tz);
if (tv)
do_vgettimeofday(tv);
return gettimeofday(tv,tz);
if (tv)
do_vgettimeofday(tv);
@@
-120,7
+120,7
@@
int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)
* unlikely */
time_t __vsyscall(1) vtime(time_t *t)
{
* unlikely */
time_t __vsyscall(1) vtime(time_t *t)
{
- if (
!__sysctl_vsyscall
)
+ if (
unlikely(!__sysctl_vsyscall)
)
return time_syscall(t);
else if (t)
*t = __xtime.tv_sec;
return time_syscall(t);
else if (t)
*t = __xtime.tv_sec;