diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
| commit | ad73c67e792c752ddc99f2b0587abae05255dd6d (patch) | |
| tree | e33d5d37a8c56b6fad753fa2d481f43cfb60ae1d /Documentation/kernel-parameters.txt | |
| parent | 08eac93a689ca05c7b7413f6d362c7d38b5fd5b1 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master'
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index e11f7728ec6f..b50595a0550f 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -448,8 +448,6 @@ running once the system is up. | |||
| 448 | Format: <area>[,<node>] | 448 | Format: <area>[,<node>] |
| 449 | See also Documentation/networking/decnet.txt. | 449 | See also Documentation/networking/decnet.txt. |
| 450 | 450 | ||
| 451 | delayacct [KNL] Enable per-task delay accounting | ||
| 452 | |||
| 453 | dhash_entries= [KNL] | 451 | dhash_entries= [KNL] |
| 454 | Set number of hash buckets for dentry cache. | 452 | Set number of hash buckets for dentry cache. |
| 455 | 453 | ||
| @@ -1031,6 +1029,8 @@ running once the system is up. | |||
| 1031 | 1029 | ||
| 1032 | nocache [ARM] | 1030 | nocache [ARM] |
| 1033 | 1031 | ||
| 1032 | nodelayacct [KNL] Disable per-task delay accounting | ||
| 1033 | |||
| 1034 | nodisconnect [HW,SCSI,M68K] Disables SCSI disconnects. | 1034 | nodisconnect [HW,SCSI,M68K] Disables SCSI disconnects. |
| 1035 | 1035 | ||
| 1036 | noexec [IA-64] | 1036 | noexec [IA-64] |