diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2008-02-08 07:19:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:29 -0500 |
commit | 3eb056764dd806bbe84eb604e45e7470feeaafd8 (patch) | |
tree | 97a8fe2123d2c9df2bcb48052ac33d445a00f64c /include/linux | |
parent | cf4fc6cb76e50b01666e28a9f4b2e6fbcbb96d5f (diff) |
time: fix typo in comments
Fix typo in comments.
BTW: I have to fix coding style in arch/ia64/kernel/time.c also, otherwise
checkpatch.pl will be complaining.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/hrtimer.h | 2 | ||||
-rw-r--r-- | include/linux/jiffies.h | 6 |
2 files changed, 4 insertions, 4 deletions
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 |