diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-02-08 07:20:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:36 -0500 |
commit | a36219ac93b3fd029f5e800642226c57796c152f (patch) | |
tree | f630c97be9d4f792e662db1510cef244c1c8d637 | |
parent | 3287629eff75c7323e875b942be82f7ac6ca18da (diff) |
The scheduled 'time' option removal
The scheduled removal of the 'time' option.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 8 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 3 | ||||
-rw-r--r-- | kernel/printk.c | 13 |
3 files changed, 0 insertions, 24 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 17b1659bd3f8..2ad5c985e204 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -192,14 +192,6 @@ Who: Len Brown <len.brown@intel.com> | |||
192 | 192 | ||
193 | --------------------------- | 193 | --------------------------- |
194 | 194 | ||
195 | What: 'time' kernel boot parameter | ||
196 | When: January 2008 | ||
197 | Why: replaced by 'printk.time=<value>' so that printk timestamps can be | ||
198 | enabled or disabled as needed | ||
199 | Who: Randy Dunlap <randy.dunlap@oracle.com> | ||
200 | |||
201 | --------------------------- | ||
202 | |||
203 | What: libata spindown skipping and warning | 195 | What: libata spindown skipping and warning |
204 | When: Dec 2008 | 196 | When: Dec 2008 |
205 | Why: Some halt(8) implementations synchronize caches for and spin | 197 | Why: Some halt(8) implementations synchronize caches for and spin |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 0dcbd266b442..a4fc7fc21439 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1973,9 +1973,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1973 | <deci-seconds>: poll all this frequency | 1973 | <deci-seconds>: poll all this frequency |
1974 | 0: no polling (default) | 1974 | 0: no polling (default) |
1975 | 1975 | ||
1976 | time Show timing data prefixed to each printk message line | ||
1977 | [deprecated, see 'printk.time'] | ||
1978 | |||
1979 | tipar.timeout= [HW,PPT] | 1976 | tipar.timeout= [HW,PPT] |
1980 | Set communications timeout in tenths of a second | 1977 | Set communications timeout in tenths of a second |
1981 | (default 15). | 1978 | (default 15). |
diff --git a/kernel/printk.c b/kernel/printk.c index 0fb8be60737c..e95e7c6e7b04 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -566,19 +566,6 @@ static int printk_time = 0; | |||
566 | #endif | 566 | #endif |
567 | module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR); | 567 | module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR); |
568 | 568 | ||
569 | static int __init printk_time_setup(char *str) | ||
570 | { | ||
571 | if (*str) | ||
572 | return 0; | ||
573 | printk_time = 1; | ||
574 | printk(KERN_NOTICE "The 'time' option is deprecated and " | ||
575 | "is scheduled for removal in early 2008\n"); | ||
576 | printk(KERN_NOTICE "Use 'printk.time=<value>' instead\n"); | ||
577 | return 1; | ||
578 | } | ||
579 | |||
580 | __setup("time", printk_time_setup); | ||
581 | |||
582 | /* Check if we have any console registered that can be called early in boot. */ | 569 | /* Check if we have any console registered that can be called early in boot. */ |
583 | static int have_callable_console(void) | 570 | static int have_callable_console(void) |
584 | { | 571 | { |