diff options
| author | Li Zefan | 2008-02-08 13:19:25 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2008-02-08 18:22:29 +0100 |
| commit | 3eb056764dd806bbe84eb604e45e7470feeaafd8 (patch) | |
| tree | 97a8fe2123d2c9df2bcb48052ac33d445a00f64c /arch | |
| parent | timekeeping: rename timekeeping_is_continuous to timekeeping_valid_for_hres (diff) | |
| download | kernel-qcow2-linux-3eb056764dd806bbe84eb604e45e7470feeaafd8.tar.gz kernel-qcow2-linux-3eb056764dd806bbe84eb604e45e7470feeaafd8.tar.xz kernel-qcow2-linux-3eb056764dd806bbe84eb604e45e7470feeaafd8.zip | |
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 'arch')
| -rw-r--r-- | arch/ia64/kernel/time.c | 14 | ||||
| -rw-r--r-- | arch/x86/kernel/time_64.c | 2 |
2 files changed, 8 insertions, 8 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); #endif static struct clocksource clocksource_itc = { - .name = "itc", - .rating = 350, - .read = itc_get_cycles, - .mask = CLOCKSOURCE_MASK(64), - .mult = 0, /*to be caluclated*/ - .shift = 16, - .flags = CLOCK_SOURCE_IS_CONTINUOUS, + .name = "itc", + .rating = 350, + .read = itc_get_cycles, + .mask = CLOCKSOURCE_MASK(64), + .mult = 0, /*to be calculated*/ + .shift = 16, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static struct clocksource *itc_clocksource; 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) reserve_evntsel_nmi(MSR_K7_EVNTSEL0 + i); } local_irq_save(flags); - /* start meauring cycles, incrementing from 0 */ + /* start measuring cycles, incrementing from 0 */ wrmsrl(MSR_K7_PERFCTR0 + i, 0); wrmsrl(MSR_K7_EVNTSEL0 + i, 1 << 22 | 3 << 16 | 0x76); rdtscl(tsc_start); |