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 5d4427d17281..cb3a169e372a 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1543,6 +1543,11 @@ and is between 256 and 4096 characters. It is defined in the file
1543 symbolic names: lapic and ioapic 1543 symbolic names: lapic and ioapic
1544 Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic 1544 Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic
1545 1545
1546 netpoll.carrier_timeout=
1547 [NET] Specifies amount of time (in seconds) that
1548 netpoll should wait for a carrier. By default netpoll
1549 waits 4 seconds.
1550
1546 no387 [BUGS=X86-32] Tells the kernel to use the 387 maths 1551 no387 [BUGS=X86-32] Tells the kernel to use the 387 maths
1547 emulation library even if a 387 maths coprocessor 1552 emulation library even if a 387 maths coprocessor
1548 is present. 1553 is present.