X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fx86_64%2Fkernel%2Fvsyscall-xen.c;fp=arch%2Fx86_64%2Fkernel%2Fvsyscall-xen.c;h=ed452cebc27a89e36896bd86ca73850f5c830f58;hb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;hp=190834bfba28f5ae750badf378214cb086f61e66;hpb=4e76c8a9fa413ccc09d3f7f664183dcce3555d57;p=linux-2.6.git diff --git a/arch/x86_64/kernel/vsyscall-xen.c b/arch/x86_64/kernel/vsyscall-xen.c index 190834bfb..ed452cebc 100644 --- a/arch/x86_64/kernel/vsyscall-xen.c +++ b/arch/x86_64/kernel/vsyscall-xen.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;