Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a36219ac93b3fd029f5e800642226c57796c152f
Commit:     a36219ac93b3fd029f5e800642226c57796c152f
Parent:     3287629eff75c7323e875b942be82f7ac6ca18da
Author:     Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 8 04:20:55 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 09:22:36 2008 -0800

    The scheduled 'time' option removal
    
    The scheduled removal of the 'time' option.
    
    Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
    Acked-by: Randy Dunlap <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 Documentation/feature-removal-schedule.txt |    8 --------
 Documentation/kernel-parameters.txt        |    3 ---
 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 17b1659..2ad5c98 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -192,14 +192,6 @@ Who:       Len Brown <[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: libata spindown skipping and warning
 When: Dec 2008
 Why:  Some halt(8) implementations synchronize caches for and spin
diff --git a/Documentation/kernel-parameters.txt 
b/Documentation/kernel-parameters.txt
index 0dcbd26..a4fc7fc 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
                        <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 0fb8be6..e95e7c6 100644
--- a/kernel/printk.c
+++ b/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=<value>' 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)
 {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to