Skip to contentSkip to conversation

fix unlikely profiling & vsyscalls on x86_64

PATCH In review Ingo Molnar 2 participants 2 messages May 4, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix unlikely profiling & vsyscalls on x86_64

fix unlikely profiling in vsyscalls ...

---
 arch/x86_64/kernel/vsyscall.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86_64/kernel/vsyscall.c +2 -2
Index: linux/arch/x86_64/kernel/vsyscall.c
===================================================================
@@ -107,7 +107,7 @@ static __always_inline long time_syscall
 
 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 t
  * 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;		
#1 lore raw
Quoted 1 line · Ingo Molnar

fix unlikely profiling in vsyscalls ...

Applied thanks

-Andi