diff options
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index dd1a6d4bb747..3fe614d405e0 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1531,6 +1531,11 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1531 | symbolic names: lapic and ioapic | 1531 | symbolic names: lapic and ioapic |
1532 | Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic | 1532 | Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic |
1533 | 1533 | ||
1534 | netpoll.carrier_timeout= | ||
1535 | [NET] Specifies amount of time (in seconds) that | ||
1536 | netpoll should wait for a carrier. By default netpoll | ||
1537 | waits 4 seconds. | ||
1538 | |||
1534 | no387 [BUGS=X86-32] Tells the kernel to use the 387 maths | 1539 | no387 [BUGS=X86-32] Tells the kernel to use the 387 maths |
1535 | emulation library even if a 387 maths coprocessor | 1540 | emulation library even if a 387 maths coprocessor |
1536 | is present. | 1541 | is present. |