Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030260AbWAXCwY (ORCPT ); Mon, 23 Jan 2006 21:52:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030296AbWAXCwY (ORCPT ); Mon, 23 Jan 2006 21:52:24 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:61375 "EHLO e34.co.us.ibm.com") by vger.kernel.org with ESMTP id S1030260AbWAXCwX (ORCPT ); Mon, 23 Jan 2006 21:52:23 -0500 Subject: [PATCH -mm] Time: Keep clock=pmtmr functional, but depricated From: john stultz To: Andrew Morton Cc: lkml Content-Type: text/plain Date: Mon, 23 Jan 2006 18:52:20 -0800 Message-Id: <1138071141.15682.81.camel@cog.beaverton.ibm.com> Mime-Version: 1.0 X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1232 Lines: 38 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 --- 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); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/