aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/feature-removal-schedule.txt8
-rw-r--r--Documentation/kernel-parameters.txt4
2 files changed, 12 insertions, 0 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>
257 257
258--------------------------- 258---------------------------
259 259
260What: 'time' kernel boot parameter
261When: January 2008
262Why: replaced by 'printk.time=<value>' so that printk timestamps can be
263 enabled or disabled as needed
264Who: Randy Dunlap <randy.dunlap@oracle.com>
265
266---------------------------
267
260What: drivers depending on OSS_OBSOLETE 268What: drivers depending on OSS_OBSOLETE
261When: options in 2.6.23, code in 2.6.25 269When: options in 2.6.23, code in 2.6.25
262Why: obsolete OSS drivers 270Why: 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
1389 the kernel console. 1389 the kernel console.
1390 default: off. 1390 default: off.
1391 1391
1392 printk.time= Show timing data prefixed to each printk message line
1393 Format: <bool> (1/Y/y=enable, 0/N/n=disable)
1394
1392 profile= [KNL] Enable kernel profiling via /proc/profile 1395 profile= [KNL] Enable kernel profiling via /proc/profile
1393 Format: [schedule,]<number> 1396 Format: [schedule,]<number>
1394 Param: "schedule" - profile schedule points. 1397 Param: "schedule" - profile schedule points.
@@ -1824,6 +1827,7 @@ and is between 256 and 4096 characters. It is defined in the file
1824 Set number of hash buckets for TCP connection 1827 Set number of hash buckets for TCP connection
1825 1828
1826 time Show timing data prefixed to each printk message line 1829 time Show timing data prefixed to each printk message line
1830 [deprecated, see 'printk.time']
1827 1831
1828 tipar.timeout= [HW,PPT] 1832 tipar.timeout= [HW,PPT]
1829 Set communications timeout in tenths of a second 1833 Set communications timeout in tenths of a second