From: John Stultz Date: Mon, 23 Dec 2013 20:53:22 +0000 (-0800) Subject: timekeeping: Remove comment that's mostly out of date X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=38aef31ce7773624c8f09ff58c4c27b3b955faaf;hp=d5a1c7e3fc38d9c7d629e1e47f32f863acbdec3d;p=~andy%2Flinux timekeeping: Remove comment that's mostly out of date Prior to 92bb1fcf57a0c2e45f7e67fbf0a8ed475a749236 (Only do nanosecond rounding on GENERIC_TIME_VSYSCALL_OLD systems), the comment here was accuate, but now we can mostly avoid the extra rounding which causes the unlikey to be actually likely here. So remove the out of date comment. Signed-off-by: John Stultz --- diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 3ff30640fc9..abfa4e86ac5 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -1134,16 +1134,6 @@ static void timekeeping_adjust(struct timekeeper *tk, s64 offset) * we can adjust by 1. */ error >>= 2; - /* - * XXX - In update_wall_time, we round up to the next - * nanosecond, and store the amount rounded up into - * the error. This causes the likely below to be unlikely. - * - * The proper fix is to avoid rounding up by using - * the high precision tk->xtime_nsec instead of - * xtime.tv_nsec everywhere. Fixing this will take some - * time. - */ if (likely(error <= interval)) adj = 1; else