3 files changed, 16 insertions, 1 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 4f69470e52d6..f5d6f4d1624d 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -257,6 +257,14 @@ Who:	Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
 
+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 <randy.dunlap@oracle.com>
+
+---------------------------
+
 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 ab38322111c4..a0362d5a911e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1389,6 +1389,9 @@ and is between 256 and 4096 characters. It is defined in the file
                         the kernel console.
                         default: off.
 
+        printk.time=    Show timing data prefixed to each printk message line
+                        Format: <bool>  (1/Y/y=enable, 0/N/n=disable)
+
         profile=        [KNL] Enable kernel profiling via /proc/profile
                         Format: [schedule,]<number>
                         Param: "schedule" - profile schedule points.
@@ -1824,6 +1827,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         Set number of hash buckets for TCP connection
 
         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
diff --git a/kernel/printk.c b/kernel/printk.c
index f46cc6dff46e..fccacf706f53 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -449,13 +449,16 @@ static int printk_time = 1;
 #else
 static int printk_time = 0;
 #endif
-module_param(printk_time, int, S_IRUGO | S_IWUSR);
+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;
 }