aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2008-02-08 07:19:25 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 12:22:29 -0500
commit3eb056764dd806bbe84eb604e45e7470feeaafd8 (patch)
tree97a8fe2123d2c9df2bcb48052ac33d445a00f64c /arch
parentcf4fc6cb76e50b01666e28a9f4b2e6fbcbb96d5f (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 'arch')
-rw-r--r--arch/ia64/kernel/time.c14
-rw-r--r--arch/x86/kernel/time_64.c2
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);
49#endif 49#endif
50 50
51static struct clocksource clocksource_itc = { 51static 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};
60static struct clocksource *itc_clocksource; 60static 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);