From 0378d0fb91e4ba8662d9771e05e9cde1f3227de2 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Thu, 27 Oct 2011 17:41:17 -0700 Subject: [PATCH] --- yaml --- r: 277417 b: refs/heads/master c: 3f86f28ffc298e168692ce88791c1d64a03b655b h: refs/heads/master i: 277415: 67d9ecfead073b8ec3459627fe68082384585389 v: v3 --- [refs] | 2 +- trunk/kernel/time/timekeeping.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5afd184737b8..00790e526027 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9fad429d438fdd736ac6816b75d16c4cd626acd +refs/heads/master: 3f86f28ffc298e168692ce88791c1d64a03b655b diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c index e45bfa3d08d5..4f532a8ce339 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -809,11 +809,11 @@ static void timekeeping_adjust(s64 offset) * First we shift it down from NTP_SHIFT to clocksource->shifted nsecs. * * Note we subtract one in the shift, so that error is really error*2. - * This "saves" dividing(shifting) intererval twice, but keeps the - * (error > interval) comparision as still measuring if error is + * This "saves" dividing(shifting) interval twice, but keeps the + * (error > interval) comparison as still measuring if error is * larger then half an interval. * - * Note: It does not "save" on aggrivation when reading the code. + * Note: It does not "save" on aggravation when reading the code. */ error = timekeeper.ntp_error >> (timekeeper.ntp_error_shift - 1); if (error > interval) { @@ -829,7 +829,7 @@ static void timekeeping_adjust(s64 offset) * nanosecond, and store the amount rounded up into * the error. This causes the likely below to be unlikely. * - * The properfix is to avoid rounding up by using + * The proper fix is to avoid rounding up by using * the high precision timekeeper.xtime_nsec instead of * xtime.tv_nsec everywhere. Fixing this will take some * time.