diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/time/clocksource.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 4288bfa12c3f..a9f387ea83b0 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -174,7 +174,7 @@ EXPORT_SYMBOL(register_clocksource); | |||
174 | * reselect_clocksource - Rescan list for next clocksource | 174 | * reselect_clocksource - Rescan list for next clocksource |
175 | * | 175 | * |
176 | * A quick helper function to be used if a clocksource changes its | 176 | * A quick helper function to be used if a clocksource changes its |
177 | * rating. Forces the clocksource list to be re-scaned for the best | 177 | * rating. Forces the clocksource list to be re-scanned for the best |
178 | * clocksource. | 178 | * clocksource. |
179 | */ | 179 | */ |
180 | void reselect_clocksource(void) | 180 | void reselect_clocksource(void) |
@@ -336,8 +336,13 @@ __setup("clocksource=", boot_override_clocksource); | |||
336 | */ | 336 | */ |
337 | static int __init boot_override_clock(char* str) | 337 | static int __init boot_override_clock(char* str) |
338 | { | 338 | { |
339 | printk("Warning! clock= boot option is deprecated.\n"); | 339 | if (!strcmp(str, "pmtmr")) { |
340 | 340 | printk("Warning: clock=pmtmr is deprecated. " | |
341 | "Use clocksource=acpi_pm.\n"); | ||
342 | return boot_override_clocksource("acpi_pm"); | ||
343 | } | ||
344 | printk("Warning! clock= boot option is deprecated. " | ||
345 | "Use clocksource=xyz\n"); | ||
341 | return boot_override_clocksource(str); | 346 | return boot_override_clocksource(str); |
342 | } | 347 | } |
343 | 348 | ||