The patch titled
Time: fix spelling typos
has been added to the -mm tree. Its filename is
time-i386-clocksource-drivers-fix-spelling-typos.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: john stultz <johnstul@xxxxxxxxxx>
I'm a terrible speller. As pointed out by Tim Mann and Jim Cromie
Signed-off-by: John Stultz <johnstul@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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
--- devel/arch/i386/kernel/tsc.c~time-i386-clocksource-drivers-fix-spelling-typos 2006-05-10 21:34:36.000000000 -0700
+++ devel-akpm/arch/i386/kernel/tsc.c 2006-05-10 21:34:36.000000000 -0700
@@ -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
--- devel/kernel/time/clocksource.c~time-i386-clocksource-drivers-fix-spelling-typos 2006-05-10 21:34:36.000000000 -0700
+++ devel-akpm/kernel/time/clocksource.c 2006-05-10 21:34:36.000000000 -0700
@@ -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");
}
_
Patches currently in -mm which might be from johnstul@xxxxxxxxxx are
time-clocksource-infrastructure.patch
time-clocksource-infrastructure-dont-enable-irq-too-early.patch
time-use-clocksource-infrastructure-for-update_wall_time.patch
time-use-clocksource-infrastructure-for-update_wall_time-mark-few-functions-as-__init.patch
time-let-user-request-precision-from-current_tick_length.patch
time-use-clocksource-abstraction-for-ntp-adjustments.patch
time-use-clocksource-abstraction-for-ntp-adjustments-optimize-out-some-mults-since-gcc-cant-avoid-them.patch
time-introduce-arch-generic-time-accessors.patch
hangcheck-remove-monotomic_clock-on-x86.patch
time-i386-conversion-part-1-move-timer_pitc-to-i8253c.patch
time-i386-conversion-part-2-rework-tsc-support.patch
time-i386-conversion-part-3-enable-generic-timekeeping.patch
time-i386-conversion-part-4-remove-old-timer_opts-code.patch
time-i386-clocksource-drivers.patch
time-i386-clocksource-drivers-pm-timer-doesnt-use-workaround-if-chipset-is-not-buggy.patch
time-i386-clocksource-drivers-pm-timer-doesnt-use-workaround-if-chipset-is-not-buggy-acpi_pm-cleanup.patch
time-i386-clocksource-drivers-pm-timer-doesnt-use-workaround-if-chipset-is-not-buggy-acpi_pm-cleanup-fix-missing-to-rename-pmtmr_good-to-acpi_pm_good.patch
time-i386-clocksource-drivers-fix-spelling-typos.patch
time-rename-clocksource-functions.patch
make-pmtmr_ioport-__read_mostly.patch
generic-time-add-macro-to-simplify-hide-mask.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
