2006-01-24 02:52:24

by john stultz

Subject: [PATCH -mm] Time: Keep clock=pmtmr functional, but depricated

With the new clocksource code, the ACPI PM timer is now called acpi_pm.
This has confused users that are familiar w/ using the clock=pmtmr boot
option.

This patch insures that the clock=pmtmr boot option will still function,
but will warn the users to use clocksource=acpi_pm in the future.

Signed-off-by: John Stultz <[email protected]>

---

diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index d62cff0..c974305 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -325,8 +325,13 @@ __setup("clocksource=", boot_override_cl
*/
static int __init boot_override_clock(char* str)
{
- printk("Warning! clock= boot option is deprecated.\n");
-
+ if (!strcmp(str, "pmtmr")) {
+ printk("Warning: clock=pmtmr is depricated. "
+ "Use clocksource=acpi_pm.\n");
+ return boot_override_clocksource("acpi_pm");
+ }
+ printk("Warning! clock= boot option is deprecated. "
+ "Use clocksource=xyz\n");
return boot_override_clocksource(str);
}

2006-01-24 02:59:17

by Lee Revell

Subject: Re: [PATCH -mm] Time: Keep clock=pmtmr functional, but depricated

On Mon, 2006-01-23 at 18:52 -0800, john stultz wrote:
> With the new clocksource code, the ACPI PM timer is now called acpi_pm.
> This has confused users that are familiar w/ using the clock=pmtmr boot
> option.
>
> This patch insures that the clock=pmtmr boot option will still function,
> but will warn the users to use clocksource=acpi_pm in the future.

What about the other clock= boot options?

I believe that changing their behavior counts as "breaking userspace".

Lee

2006-01-24 03:02:42

by john stultz

Subject: Re: [PATCH -mm] Time: Keep clock=pmtmr functional, but depricated

On Mon, 2006-01-23 at 21:59 -0500, Lee Revell wrote:
> On Mon, 2006-01-23 at 18:52 -0800, john stultz wrote:
> > With the new clocksource code, the ACPI PM timer is now called acpi_pm.
> > This has confused users that are familiar w/ using the clock=pmtmr boot
> > option.
> >
> > This patch insures that the clock=pmtmr boot option will still function,
> > but will warn the users to use clocksource=acpi_pm in the future.
>
> What about the other clock= boot options?

They are using the same old names: "cyclone", "hpet", "pit", "tsc"
So nothing changes there, clock= will still function (but prints out a
warning).

> I believe that changing their behavior counts as "breaking userspace".

I'm not sure I'd consider changing a kernel boot parameter as "breaking
userspace", but I do agree that we should preserve behavior for awhile
to avoid confusion, and that is what this patch provides.

thanks
-john