diff options
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index c357a31411cd..cc85a9278190 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -699,7 +699,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
699 | ekgdboc= [X86,KGDB] Allow early kernel console debugging | 699 | ekgdboc= [X86,KGDB] Allow early kernel console debugging |
700 | ekgdboc=kbd | 700 | ekgdboc=kbd |
701 | 701 | ||
702 | This is desgined to be used in conjunction with | 702 | This is designed to be used in conjunction with |
703 | the boot argument: earlyprintk=vga | 703 | the boot argument: earlyprintk=vga |
704 | 704 | ||
705 | edd= [EDD] | 705 | edd= [EDD] |
@@ -1832,15 +1832,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
1832 | perfmon on Intel CPUs instead of the | 1832 | perfmon on Intel CPUs instead of the |
1833 | CPU specific event set. | 1833 | CPU specific event set. |
1834 | 1834 | ||
1835 | oops=panic Always panic on oopses. Default is to just kill the process, | 1835 | oops=panic Always panic on oopses. Default is to just kill the |
1836 | but there is a small probability of deadlocking the machine. | 1836 | process, but there is a small probability of |
1837 | deadlocking the machine. | ||
1837 | This will also cause panics on machine check exceptions. | 1838 | This will also cause panics on machine check exceptions. |
1838 | Useful together with panic=30 to trigger a reboot. | 1839 | Useful together with panic=30 to trigger a reboot. |
1839 | 1840 | ||
1840 | OSS [HW,OSS] | 1841 | OSS [HW,OSS] |
1841 | See Documentation/sound/oss/oss-parameters.txt | 1842 | See Documentation/sound/oss/oss-parameters.txt |
1842 | 1843 | ||
1843 | panic= [KNL] Kernel behaviour on panic | 1844 | panic= [KNL] Kernel behaviour on panic: delay <timeout> |
1845 | seconds before rebooting | ||
1844 | Format: <timeout> | 1846 | Format: <timeout> |
1845 | 1847 | ||
1846 | parkbd.port= [HW] Parallel port number the keyboard adapter is | 1848 | parkbd.port= [HW] Parallel port number the keyboard adapter is |
@@ -2343,6 +2345,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
2343 | 2345 | ||
2344 | softlockup_panic= | 2346 | softlockup_panic= |
2345 | [KNL] Should the soft-lockup detector generate panics. | 2347 | [KNL] Should the soft-lockup detector generate panics. |
2348 | Format: <integer> | ||
2346 | 2349 | ||
2347 | sonypi.*= [HW] Sony Programmable I/O Control Device driver | 2350 | sonypi.*= [HW] Sony Programmable I/O Control Device driver |
2348 | See Documentation/sonypi.txt | 2351 | See Documentation/sonypi.txt |
@@ -2475,8 +2478,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
2475 | topology= [S390] | 2478 | topology= [S390] |
2476 | Format: {off | on} | 2479 | Format: {off | on} |
2477 | Specify if the kernel should make use of the cpu | 2480 | Specify if the kernel should make use of the cpu |
2478 | topology informations if the hardware supports these. | 2481 | topology information if the hardware supports this. |
2479 | The scheduler will make use of these informations and | 2482 | The scheduler will make use of this information and |
2480 | e.g. base its process migration decisions on it. | 2483 | e.g. base its process migration decisions on it. |
2481 | Default is on. | 2484 | Default is on. |
2482 | 2485 | ||
@@ -2529,8 +2532,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
2529 | reported either. | 2532 | reported either. |
2530 | 2533 | ||
2531 | unknown_nmi_panic | 2534 | unknown_nmi_panic |
2532 | [X86] | 2535 | [X86] Cause panic on unknown NMI. |
2533 | Set unknown_nmi_panic=1 early on boot. | ||
2534 | 2536 | ||
2535 | usbcore.autosuspend= | 2537 | usbcore.autosuspend= |
2536 | [USB] The autosuspend time delay (in seconds) used | 2538 | [USB] The autosuspend time delay (in seconds) used |