aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-12-23 15:53:22 -0500
committerJohn Stultz <john.stultz@linaro.org>2013-12-23 15:53:22 -0500
commit38aef31ce7773624c8f09ff58c4c27b3b955faaf (patch)
treef201d1b646229ee8f99eed411ae28cdfc4fce905
parentd5a1c7e3fc38d9c7d629e1e47f32f863acbdec3d (diff)
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 <john.stultz@linaro.org>
-rw-r--r--kernel/time/timekeeping.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 3ff30640fc9d..abfa4e86ac54 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1134,16 +1134,6 @@ static void timekeeping_adjust(struct timekeeper *tk, s64 offset)
1134 * we can adjust by 1. 1134 * we can adjust by 1.
1135 */ 1135 */
1136 error >>= 2; 1136 error >>= 2;
1137 /*
1138 * XXX - In update_wall_time, we round up to the next
1139 * nanosecond, and store the amount rounded up into
1140 * the error. This causes the likely below to be unlikely.
1141 *
1142 * The proper fix is to avoid rounding up by using
1143 * the high precision tk->xtime_nsec instead of
1144 * xtime.tv_nsec everywhere. Fixing this will take some
1145 * time.
1146 */
1147 if (likely(error <= interval)) 1137 if (likely(error <= interval))
1148 adj = 1; 1138 adj = 1;
1149 else 1139 else