From: Andrew Morton Cc: Daniel Walker Cc: Hua Zhong Cc: Andi Kleen Signed-off-by: Andrew Morton --- arch/x86/vdso/vclock_gettime.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff -puN arch/x86/vdso/vclock_gettime.c~profile-likely-unlikely-macros-fix arch/x86/vdso/vclock_gettime.c --- a/arch/x86/vdso/vclock_gettime.c~profile-likely-unlikely-macros-fix +++ a/arch/x86/vdso/vclock_gettime.c @@ -48,7 +48,7 @@ notrace static noinline int do_realtime( ts->tv_sec = gtod->wall_time_sec; ts->tv_nsec = gtod->wall_time_nsec; ns = vgetns(); - } while (unlikely(read_seqretry(>od->lock, seq))); + } while (read_seqretry(>od->lock, seq)); timespec_add_ns(ts, ns); return 0; } @@ -78,14 +78,14 @@ notrace static noinline int do_monotonic ns = gtod->wall_time_nsec + vgetns(); secs += gtod->wall_to_monotonic.tv_sec; ns += gtod->wall_to_monotonic.tv_nsec; - } while (unlikely(read_seqretry(>od->lock, seq))); + } while (read_seqretry(>od->lock, seq)); vset_normalized_timespec(ts, secs, ns); return 0; } notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) { - if (likely(gtod->sysctl_enabled && gtod->clock.vread)) + if (gtod->sysctl_enabled && gtod->clock.vread) switch (clock) { case CLOCK_REALTIME: return do_realtime(ts); @@ -100,13 +100,13 @@ int clock_gettime(clockid_t, struct time notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) { long ret; - if (likely(gtod->sysctl_enabled && gtod->clock.vread)) { + if (gtod->sysctl_enabled && gtod->clock.vread) { BUILD_BUG_ON(offsetof(struct timeval, tv_usec) != offsetof(struct timespec, tv_nsec) || sizeof(*tv) != sizeof(struct timespec)); do_realtime((struct timespec *)tv); tv->tv_usec /= 1000; - if (unlikely(tz != NULL)) { + if (tz != NULL) { /* This relies on gcc inlining the memcpy. We'll notice if it ever fails to do so. */ memcpy(tz, >od->sys_tz, sizeof(struct timezone)); _