From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755168AbYATRc0 (ORCPT ); Sun, 20 Jan 2008 12:32:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753822AbYATRcT (ORCPT ); Sun, 20 Jan 2008 12:32:19 -0500 Received: from rgminet01.oracle.com ([148.87.113.118]:62688 "EHLO rgminet01.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753475AbYATRcT (ORCPT ); Sun, 20 Jan 2008 12:32:19 -0500 Message-ID: <4793857A.5030802@oracle.com> Date: Sun, 20 Jan 2008 09:31:38 -0800 From: Randy Dunlap User-Agent: Thunderbird 1.5.0.5 (X11/20060719) MIME-Version: 1.0 To: Adrian Bunk CC: linux-kernel@vger.kernel.org Subject: Re: [2.6 patch] the scheduled 'time' option removal References: <20080101134656.GG2360@does.not.exist> <20080101180751.9d31262b.randy.dunlap@oracle.com> <20080120140213.GG8669@does.not.exist> In-Reply-To: <20080120140213.GG8669@does.not.exist> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAQAAAAI= X-Brightmail-Tracker: AAAAAQAAAAI= X-Whitelist: TRUE X-Whitelist: TRUE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adrian Bunk wrote: > On Tue, Jan 01, 2008 at 06:07:51PM -0800, Randy Dunlap wrote: >> On Tue, 1 Jan 2008 15:46:56 +0200 Adrian Bunk wrote: >> >>> This patch contains the scheduled removal of the 'time' option. >>> >>> Signed-off-by: Adrian Bunk >> Thanks. Looks good except that Documentation/kernel-parameters.txt >> needs a patch also: delete these 3 lines: >> >> time Show timing data prefixed to each printk message line >> [deprecated, see 'printk.time'] >> >> then I will Ack it. > > Ups, sorry, fixed patch below. > > cu > Adrian > > > <-- snip --> > > > This patch contains the scheduled removal of the 'time' option. > > Signed-off-by: Adrian Bunk Acked-by: Randy Dunlap Thanks, Adrian. > --- > > Documentation/feature-removal-schedule.txt | 8 -------- > Documentation/kernel-parameters.txt | 3 --- > kernel/printk.c | 13 ------------- > 3 files changed, 24 deletions(-) > > 84ec4030ca61db7f80b6d761acb7d12255cc5cf6 > diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt > index 20c4c8b..93aac19 100644 > --- a/Documentation/feature-removal-schedule.txt > +++ b/Documentation/feature-removal-schedule.txt > @@ -233,14 +233,6 @@ Who: Jean Delvare > > --------------------------- > > -What: 'time' kernel boot parameter > -When: January 2008 > -Why: replaced by 'printk.time=' so that printk timestamps can be > - enabled or disabled as needed > -Who: Randy Dunlap > - > ---------------------------- > - > What: drivers depending on OSS_OBSOLETE > When: options in 2.6.23, code in 2.6.25 > Why: obsolete OSS drivers > diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt > index c417877..79afb11 100644 > --- a/Documentation/kernel-parameters.txt > +++ b/Documentation/kernel-parameters.txt > @@ -1899,9 +1899,6 @@ and is between 256 and 4096 characters. It is defined in the file > : poll all this frequency > 0: no polling (default) > > - time Show timing data prefixed to each printk message line > - [deprecated, see 'printk.time'] > - > tipar.timeout= [HW,PPT] > Set communications timeout in tenths of a second > (default 15). > diff --git a/kernel/printk.c b/kernel/printk.c > index 89011bf..3aa8749 100644 > --- a/kernel/printk.c > +++ b/kernel/printk.c > @@ -560,19 +560,6 @@ static int printk_time = 0; > #endif > module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR); > > -static int __init printk_time_setup(char *str) > -{ > - if (*str) > - return 0; > - printk_time = 1; > - printk(KERN_NOTICE "The 'time' option is deprecated and " > - "is scheduled for removal in early 2008\n"); > - printk(KERN_NOTICE "Use 'printk.time=' instead\n"); > - return 1; > -} > - > -__setup("time", printk_time_setup); > - > __attribute__((weak)) unsigned long long printk_clock(void) > { > return sched_clock(); > -- ~Randy