diff options
-rw-r--r-- | kernel/time/timekeeping.c | 10 |
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 |