Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, tsc: Skip TSC synchronization checks for tsc=reliable
  clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz
  clocksource: cris: Convert to clocksource_register_khz
  clocksource: xtensa: Convert to clocksource_register_hz/khz
  clocksource: um: Convert to clocksource_register_hz/khz
  clocksource: parisc: Convert to clocksource_register_hz/khz
  clocksource: m86k: Convert to clocksource_register_hz/khz
  time: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver
  time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver
  time: x86: Remove CLOCK_TICK_RATE from mach_timer.h
  time: x86: Remove CLOCK_TICK_RATE from tsc code
  time: Fix spelling mistakes in new comments
  time: fix bogus comment in timekeeping_get_ns_raw

1 files changed, 5 insertions, 5 deletions

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 237841378c03..0c6358186401 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);
 }
 
@@ -813,11 +813,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) {
@@ -833,7 +833,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.