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 <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
Acked-by: Randy Dunlap <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
---------------------------
-What: 'time' kernel boot parameter
-When: January 2008
-Why: replaced by 'printk.time=<value>' so that printk timestamps can be
- enabled or disabled as needed
-Who: Randy Dunlap <[EMAIL PROTECTED]>
-
----------------------------
-
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
<deci-seconds>: 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=<value>' instead\n");
- return 1;
-}
-
-__setup("time", printk_time_setup);
-
__attribute__((weak)) unsigned long long printk_clock(void)
{
return sched_clock();
--
~Randy
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
