Commit:     e84845c4bf9a00533352e5805b35f42acdb04a1e
Parent:     185848707e73382ba930857502a0b80ff6039967
Author:     Randy Dunlap <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 15 23:40:25 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jul 16 09:05:45 2007 -0700

    add printk.time option, deprecate 'time'
    Allow printk_time to be enabled or disabled at boot time.  Previously it
    could be enabled only, but not disabled.
    Change printk_time from an int to a bool since that's what it is.  Make its
    logical (exposed) name just be "time" (was "printk_time").
    Note: Changes kernel boot option syntax from "time" to "printk.time=value".
    Since printk_time is declared as a module_param, it can also be
    changed at run-time by modifying
    to a value of 1/Y/y to enabled it or 0/N/n to disable it.
    Since printk_time is declared as a module_param, its value can also
    be set at boot-time by using
      linux printk.time=<bool>
    If the "time" boot option is used, print a message that it is deprecated
    and will be removed.
    Note its planned removal in feature-removal-schedule.txt.
    Signed-off-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        |    4 ++++
 kernel/printk.c                            |    5 ++++-
 3 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/Documentation/feature-removal-schedule.txt 
index 4f69470..f5d6f4d 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -257,6 +257,14 @@ 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 
index ab38322..a0362d5 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 f46cc6d..fccacf7 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -449,13 +449,16 @@ static int printk_time = 1;
 static int printk_time = 0;
-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;
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

Reply via email to