From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 26 Jun 2006 11:56:58 +0000 (+0200)
Subject: [PATCH] x86_64: fix unlikely profiling & vsyscalls on x86_64
X-Git-Tag: v2.6.18-rc1~612^2~63
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14118c3cdd46d72e503ee2f727b11d881f72f755;p=linux-2.6

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

fix unlikely profiling in vsyscalls ...

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c
index 9468fb20b0..f603037df1 100644
--- 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)
 {
-	if (unlikely(!__sysctl_vsyscall))
+	if (!__sysctl_vsyscall)
 		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)
 {
-	if (unlikely(!__sysctl_vsyscall))
+	if (!__sysctl_vsyscall)
 		return time_syscall(t);
 	else if (t)
 		*t = __xtime.tv_sec;