aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 94ce0d20253d..242b3a09b6ce 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1164,6 +1164,9 @@ and is between 256 and 4096 characters. It is defined in the file
1164 1164
1165 nomce [IA-32] Machine Check Exception 1165 nomce [IA-32] Machine Check Exception
1166 1166
1167 noreplace-smp [IA-32,SMP] Don't replace SMP instructions
1168 with UP alternatives
1169
1167 noresidual [PPC] Don't use residual data on PReP machines. 1170 noresidual [PPC] Don't use residual data on PReP machines.
1168 1171
1169 noresume [SWSUSP] Disables resume and restores original swap 1172 noresume [SWSUSP] Disables resume and restores original swap
@@ -1569,6 +1572,9 @@ and is between 256 and 4096 characters. It is defined in the file
1569 smart2= [HW] 1572 smart2= [HW]
1570 Format: <io1>[,<io2>[,...,<io8>]] 1573 Format: <io1>[,<io2>[,...,<io8>]]
1571 1574
1575 smp-alt-once [IA-32,SMP] On a hotplug CPU system, only
1576 attempt to substitute SMP alternatives once at boot.
1577
1572 snd-ad1816a= [HW,ALSA] 1578 snd-ad1816a= [HW,ALSA]
1573 1579
1574 snd-ad1848= [HW,ALSA] 1580 snd-ad1848= [HW,ALSA]