diff options
-rw-r--r-- | arch/ia64/kernel/time.c | 14 | ||||
-rw-r--r-- | arch/x86/kernel/time_64.c | 2 | ||||
-rw-r--r-- | include/linux/hrtimer.h | 2 | ||||
-rw-r--r-- | include/linux/jiffies.h | 6 | ||||
-rw-r--r-- | kernel/time.c | 4 | ||||
-rw-r--r-- | kernel/time/clockevents.c | 2 | ||||
-rw-r--r-- | kernel/time/timekeeping.c | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 3ab042720970..17fda5293c67 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
@@ -49,13 +49,13 @@ EXPORT_SYMBOL(last_cli_ip); | |||
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | static struct clocksource clocksource_itc = { | 51 | static struct clocksource clocksource_itc = { |
52 | .name = "itc", | 52 | .name = "itc", |
53 | .rating = 350, | 53 | .rating = 350, |
54 | .read = itc_get_cycles, | 54 | .read = itc_get_cycles, |
55 | .mask = CLOCKSOURCE_MASK(64), | 55 | .mask = CLOCKSOURCE_MASK(64), |
56 | .mult = 0, /*to be caluclated*/ | 56 | .mult = 0, /*to be calculated*/ |
57 | .shift = 16, | 57 | .shift = 16, |
58 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 58 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
59 | }; | 59 | }; |
60 | static struct clocksource *itc_clocksource; | 60 | static struct clocksource *itc_clocksource; |
61 | 61 | ||
diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c index 0380795121a6..c737849e2ef7 100644 --- a/arch/x86/kernel/time_64.c +++ b/arch/x86/kernel/time_64.c | |||
@@ -77,7 +77,7 @@ unsigned long __init native_calculate_cpu_khz(void) | |||
77 | reserve_evntsel_nmi(MSR_K7_EVNTSEL0 + i); | 77 | reserve_evntsel_nmi(MSR_K7_EVNTSEL0 + i); |
78 | } | 78 | } |
79 | local_irq_save(flags); | 79 | local_irq_save(flags); |
80 | /* start meauring cycles, incrementing from 0 */ | 80 | /* start measuring cycles, incrementing from 0 */ |
81 | wrmsrl(MSR_K7_PERFCTR0 + i, 0); | 81 | wrmsrl(MSR_K7_PERFCTR0 + i, 0); |
82 | wrmsrl(MSR_K7_EVNTSEL0 + i, 1 << 22 | 3 << 16 | 0x76); | 82 | wrmsrl(MSR_K7_EVNTSEL0 + i, 1 << 22 | 3 << 16 | 0x76); |
83 | rdtscl(tsc_start); | 83 | rdtscl(tsc_start); |
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 203591e23210..600fc3bcf63e 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
@@ -78,7 +78,7 @@ enum hrtimer_cb_mode { | |||
78 | * as otherwise the timer could be removed before the softirq code finishes the | 78 | * as otherwise the timer could be removed before the softirq code finishes the |
79 | * the handling of the timer. | 79 | * the handling of the timer. |
80 | * | 80 | * |
81 | * The HRTIMER_STATE_ENQUEUE bit is always or'ed to the current state to | 81 | * The HRTIMER_STATE_ENQUEUED bit is always or'ed to the current state to |
82 | * preserve the HRTIMER_STATE_CALLBACK bit in the above scenario. | 82 | * preserve the HRTIMER_STATE_CALLBACK bit in the above scenario. |
83 | * | 83 | * |
84 | * All state transitions are protected by cpu_base->lock. | 84 | * All state transitions are protected by cpu_base->lock. |
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index 7ba9e47bf061..e0b5b684d83f 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h | |||
@@ -42,7 +42,7 @@ | |||
42 | /* LATCH is used in the interval timer and ftape setup. */ | 42 | /* LATCH is used in the interval timer and ftape setup. */ |
43 | #define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ) /* For divider */ | 43 | #define LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ) /* For divider */ |
44 | 44 | ||
45 | /* Suppose we want to devide two numbers NOM and DEN: NOM/DEN, the we can | 45 | /* Suppose we want to devide two numbers NOM and DEN: NOM/DEN, then we can |
46 | * improve accuracy by shifting LSH bits, hence calculating: | 46 | * improve accuracy by shifting LSH bits, hence calculating: |
47 | * (NOM << LSH) / DEN | 47 | * (NOM << LSH) / DEN |
48 | * This however means trouble for large NOM, because (NOM << LSH) may no | 48 | * This however means trouble for large NOM, because (NOM << LSH) may no |
@@ -160,7 +160,7 @@ extern unsigned long preset_lpj; | |||
160 | * We want to do realistic conversions of time so we need to use the same | 160 | * We want to do realistic conversions of time so we need to use the same |
161 | * values the update wall clock code uses as the jiffies size. This value | 161 | * values the update wall clock code uses as the jiffies size. This value |
162 | * is: TICK_NSEC (which is defined in timex.h). This | 162 | * is: TICK_NSEC (which is defined in timex.h). This |
163 | * is a constant and is in nanoseconds. We will used scaled math | 163 | * is a constant and is in nanoseconds. We will use scaled math |
164 | * with a set of scales defined here as SEC_JIFFIE_SC, USEC_JIFFIE_SC and | 164 | * with a set of scales defined here as SEC_JIFFIE_SC, USEC_JIFFIE_SC and |
165 | * NSEC_JIFFIE_SC. Note that these defines contain nothing but | 165 | * NSEC_JIFFIE_SC. Note that these defines contain nothing but |
166 | * constants and so are computed at compile time. SHIFT_HZ (computed in | 166 | * constants and so are computed at compile time. SHIFT_HZ (computed in |
@@ -204,7 +204,7 @@ extern unsigned long preset_lpj; | |||
204 | * operator if the result is a long long AND at least one of the | 204 | * operator if the result is a long long AND at least one of the |
205 | * operands is cast to long long (usually just prior to the "*" so as | 205 | * operands is cast to long long (usually just prior to the "*" so as |
206 | * not to confuse it into thinking it really has a 64-bit operand, | 206 | * not to confuse it into thinking it really has a 64-bit operand, |
207 | * which, buy the way, it can do, but it take more code and at least 2 | 207 | * which, buy the way, it can do, but it takes more code and at least 2 |
208 | * mpys). | 208 | * mpys). |
209 | 209 | ||
210 | * We also need to be aware that one second in nanoseconds is only a | 210 | * We also need to be aware that one second in nanoseconds is only a |
diff --git a/kernel/time.c b/kernel/time.c index 33af3e55570d..3b705ecc3fb7 100644 --- a/kernel/time.c +++ b/kernel/time.c | |||
@@ -267,7 +267,7 @@ EXPORT_SYMBOL(jiffies_to_usecs); | |||
267 | * | 267 | * |
268 | * This function should be only used for timestamps returned by | 268 | * This function should be only used for timestamps returned by |
269 | * current_kernel_time() or CURRENT_TIME, not with do_gettimeofday() because | 269 | * current_kernel_time() or CURRENT_TIME, not with do_gettimeofday() because |
270 | * it doesn't handle the better resolution of the later. | 270 | * it doesn't handle the better resolution of the latter. |
271 | */ | 271 | */ |
272 | struct timespec timespec_trunc(struct timespec t, unsigned gran) | 272 | struct timespec timespec_trunc(struct timespec t, unsigned gran) |
273 | { | 273 | { |
@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(getnstimeofday); | |||
315 | * This algorithm was first published by Gauss (I think). | 315 | * This algorithm was first published by Gauss (I think). |
316 | * | 316 | * |
317 | * WARNING: this function will overflow on 2106-02-07 06:28:16 on | 317 | * WARNING: this function will overflow on 2106-02-07 06:28:16 on |
318 | * machines were long is 32-bit! (However, as time_t is signed, we | 318 | * machines where long is 32-bit! (However, as time_t is signed, we |
319 | * will already get problems at other places on 2038-01-19 03:14:08) | 319 | * will already get problems at other places on 2038-01-19 03:14:08) |
320 | */ | 320 | */ |
321 | unsigned long | 321 | unsigned long |
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 1d327f6db424..3d1e3e1a1971 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c | |||
@@ -133,7 +133,7 @@ static void clockevents_do_notify(unsigned long reason, void *dev) | |||
133 | } | 133 | } |
134 | 134 | ||
135 | /* | 135 | /* |
136 | * Called after a notify add to make devices availble which were | 136 | * Called after a notify add to make devices available which were |
137 | * released from the notifier call. | 137 | * released from the notifier call. |
138 | */ | 138 | */ |
139 | static void clockevents_notify_released(void) | 139 | static void clockevents_notify_released(void) |
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 4f2637eed0f6..1af9fb050fe2 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -364,7 +364,7 @@ static __always_inline int clocksource_bigadjust(s64 error, s64 *interval, | |||
364 | * with losing too many ticks, otherwise we would overadjust and | 364 | * with losing too many ticks, otherwise we would overadjust and |
365 | * produce an even larger error. The smaller the adjustment the | 365 | * produce an even larger error. The smaller the adjustment the |
366 | * faster we try to adjust for it, as lost ticks can do less harm | 366 | * faster we try to adjust for it, as lost ticks can do less harm |
367 | * here. This is tuned so that an error of about 1 msec is adusted | 367 | * here. This is tuned so that an error of about 1 msec is adjusted |
368 | * within about 1 sec (or 2^20 nsec in 2^SHIFT_HZ ticks). | 368 | * within about 1 sec (or 2^20 nsec in 2^SHIFT_HZ ticks). |
369 | */ | 369 | */ |
370 | error2 = clock->error >> (TICK_LENGTH_SHIFT + 22 - 2 * SHIFT_HZ); | 370 | error2 = clock->error >> (TICK_LENGTH_SHIFT + 22 - 2 * SHIFT_HZ); |