From: john stultz I'm a terrible speller. As pointed out by Tim Mann and Jim Cromie Signed-off-by: John Stultz Signed-off-by: Andrew Morton --- arch/i386/kernel/tsc.c | 12 ++++++------ kernel/time/clocksource.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff -puN arch/i386/kernel/tsc.c~time-i386-clocksource-drivers-fix-spelling-typos arch/i386/kernel/tsc.c --- a/arch/i386/kernel/tsc.c~time-i386-clocksource-drivers-fix-spelling-typos +++ a/arch/i386/kernel/tsc.c @@ -388,7 +388,7 @@ static struct dmi_system_id __initdata b }; #define TSC_FREQ_CHECK_INTERVAL (10*MSEC_PER_SEC) /* 10sec in MS */ -static struct timer_list verfiy_tsc_freq_timer; +static struct timer_list verify_tsc_freq_timer; /* XXX - Probably should add locking */ static void verify_tsc_freq(unsigned long unused) @@ -426,7 +426,7 @@ out: last_tsc = now_tsc; last_jiffies = now_jiffies; /* set us up to go off on the next interval: */ - mod_timer(&verfiy_tsc_freq_timer, + mod_timer(&verify_tsc_freq_timer, jiffies + msecs_to_jiffies(TSC_FREQ_CHECK_INTERVAL)); } @@ -463,11 +463,11 @@ static int __init init_tsc_clocksource(v if (check_tsc_unstable()) clocksource_tsc.rating = 50; - init_timer(&verfiy_tsc_freq_timer); - verfiy_tsc_freq_timer.function = verify_tsc_freq; - verfiy_tsc_freq_timer.expires = + init_timer(&verify_tsc_freq_timer); + verify_tsc_freq_timer.function = verify_tsc_freq; + verify_tsc_freq_timer.expires = jiffies + msecs_to_jiffies(TSC_FREQ_CHECK_INTERVAL); - add_timer(&verfiy_tsc_freq_timer); + add_timer(&verify_tsc_freq_timer); return register_clocksource(&clocksource_tsc); } diff -puN kernel/time/clocksource.c~time-i386-clocksource-drivers-fix-spelling-typos kernel/time/clocksource.c --- a/kernel/time/clocksource.c~time-i386-clocksource-drivers-fix-spelling-typos +++ a/kernel/time/clocksource.c @@ -174,7 +174,7 @@ EXPORT_SYMBOL(register_clocksource); * reselect_clocksource - Rescan list for next clocksource * * A quick helper function to be used if a clocksource changes its - * rating. Forces the clocksource list to be re-scaned for the best + * rating. Forces the clocksource list to be re-scanned for the best * clocksource. */ void reselect_clocksource(void) @@ -337,7 +337,7 @@ __setup("clocksource=", boot_override_cl static int __init boot_override_clock(char* str) { if (!strcmp(str, "pmtmr")) { - printk("Warning: clock=pmtmr is depricated. " + printk("Warning: clock=pmtmr is deprecated. " "Use clocksource=acpi_pm.\n"); return boot_override_clocksource("acpi_pm"); } _