Commit 14118c3c authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds

[PATCH] x86_64: fix unlikely profiling & vsyscalls on x86_64

fix unlikely profiling in vsyscalls ...
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4b787e0b
...@@ -107,7 +107,7 @@ static __always_inline long time_syscall(long *t) ...@@ -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 (unlikely(!__sysctl_vsyscall)) if (!__sysctl_vsyscall)
return gettimeofday(tv,tz); return gettimeofday(tv,tz);
if (tv) if (tv)
do_vgettimeofday(tv); do_vgettimeofday(tv);
...@@ -120,7 +120,7 @@ int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz) ...@@ -120,7 +120,7 @@ int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)
* unlikely */ * unlikely */
time_t __vsyscall(1) vtime(time_t *t) time_t __vsyscall(1) vtime(time_t *t)
{ {
if (unlikely(!__sysctl_vsyscall)) if (!__sysctl_vsyscall)
return time_syscall(t); return time_syscall(t);
else if (t) else if (t)
*t = __xtime.tv_sec; *t = __xtime.tv_sec;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment