From dcc99230f8543ce92ce748eaf1c47c75acb8fbfa Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Fri, 8 Feb 2008 04:20:55 -0800 Subject: [PATCH] --- yaml --- r: 84757 b: refs/heads/master c: a36219ac93b3fd029f5e800642226c57796c152f h: refs/heads/master i: 84755: a563d552c770c91916cebbf9d177f640ef621952 v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 8 -------- trunk/Documentation/kernel-parameters.txt | 3 --- trunk/kernel/printk.c | 13 ------------- 4 files changed, 1 insertion(+), 25 deletions(-) diff --git a/[refs] b/[refs] index a6cc7b60df3d..05ba522335d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3287629eff75c7323e875b942be82f7ac6ca18da +refs/heads/master: a36219ac93b3fd029f5e800642226c57796c152f diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 17b1659bd3f8..2ad5c985e204 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -192,14 +192,6 @@ Who: Len Brown --------------------------- -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: libata spindown skipping and warning When: Dec 2008 Why: Some halt(8) implementations synchronize caches for and spin diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 0dcbd266b442..a4fc7fc21439 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1973,9 +1973,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/trunk/kernel/printk.c b/trunk/kernel/printk.c index 0fb8be60737c..e95e7c6e7b04 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -566,19 +566,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); - /* Check if we have any console registered that can be called early in boot. */ static int have_callable_console(void) {