aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c4178778e7fd..17fc60e32443 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -34,6 +34,7 @@ parameter is applicable:
34 ALSA ALSA sound support is enabled. 34 ALSA ALSA sound support is enabled.
35 APIC APIC support is enabled. 35 APIC APIC support is enabled.
36 APM Advanced Power Management support is enabled. 36 APM Advanced Power Management support is enabled.
37 AVR32 AVR32 architecture is enabled.
37 AX25 Appropriate AX.25 support is enabled. 38 AX25 Appropriate AX.25 support is enabled.
38 BLACKFIN Blackfin architecture is enabled. 39 BLACKFIN Blackfin architecture is enabled.
39 DRM Direct Rendering Management support is enabled. 40 DRM Direct Rendering Management support is enabled.
@@ -1123,6 +1124,10 @@ and is between 256 and 4096 characters. It is defined in the file
1123 of returning the full 64-bit number. 1124 of returning the full 64-bit number.
1124 The default is to return 64-bit inode numbers. 1125 The default is to return 64-bit inode numbers.
1125 1126
1127 nmi_debug= [KNL,AVR32] Specify one or more actions to take
1128 when a NMI is triggered.
1129 Format: [state][,regs][,debounce][,die]
1130
1126 nmi_watchdog= [KNL,BUGS=X86-32] Debugging features for SMP kernels 1131 nmi_watchdog= [KNL,BUGS=X86-32] Debugging features for SMP kernels
1127 1132
1128 no387 [BUGS=X86-32] Tells the kernel to use the 387 maths 1133 no387 [BUGS=X86-32] Tells the kernel to use the 387 maths