summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee2011-10-17 20:58:43 +0200
committerJohn Stultz2011-11-22 04:00:46 +0100
commitc9fad429d438fdd736ac6816b75d16c4cd626acd (patch)
tree165c5edface9e59d4634ff2a5d0e6dd135d9532a
parentMerge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/js... (diff)
downloadkernel-qcow2-linux-c9fad429d438fdd736ac6816b75d16c4cd626acd.tar.gz
kernel-qcow2-linux-c9fad429d438fdd736ac6816b75d16c4cd626acd.tar.xz
kernel-qcow2-linux-c9fad429d438fdd736ac6816b75d16c4cd626acd.zip
time: fix bogus comment in timekeeping_get_ns_raw
The whole point of this function is to return a value not touched by NTP; unfortunately the comment got copied wholesale without adjustment from the timekeeping_get_ns function above. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--kernel/time/timekeeping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index e9f60d311436..e45bfa3d08d5 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -131,7 +131,7 @@ static inline s64 timekeeping_get_ns_raw(void)
/* calculate the delta since the last update_wall_time: */
cycle_delta = (cycle_now - clock->cycle_last) & clock->mask;
- /* return delta convert to nanoseconds using ntp adjusted mult. */
+ /* return delta convert to nanoseconds. */
return clocksource_cyc2ns(cycle_delta, clock->mult, clock->shift);
}