diff options
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index ab95d3ada5c7..736d45602886 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -240,7 +240,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
240 | 240 | ||
241 | acpi_sleep= [HW,ACPI] Sleep options | 241 | acpi_sleep= [HW,ACPI] Sleep options |
242 | Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, | 242 | Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, |
243 | old_ordering, s4_nonvs } | 243 | old_ordering, s4_nonvs, sci_force_enable } |
244 | See Documentation/power/video.txt for information on | 244 | See Documentation/power/video.txt for information on |
245 | s3_bios and s3_mode. | 245 | s3_bios and s3_mode. |
246 | s3_beep is for debugging; it makes the PC's speaker beep | 246 | s3_beep is for debugging; it makes the PC's speaker beep |
@@ -253,6 +253,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
253 | of _PTS is used by default). | 253 | of _PTS is used by default). |
254 | s4_nonvs prevents the kernel from saving/restoring the | 254 | s4_nonvs prevents the kernel from saving/restoring the |
255 | ACPI NVS memory during hibernation. | 255 | ACPI NVS memory during hibernation. |
256 | sci_force_enable causes the kernel to set SCI_EN directly | ||
257 | on resume from S1/S3 (which is against the ACPI spec, | ||
258 | but some broken systems don't work without it). | ||
256 | 259 | ||
257 | acpi_use_timer_override [HW,ACPI] | 260 | acpi_use_timer_override [HW,ACPI] |
258 | Use timer override. For some broken Nvidia NF5 boards | 261 | Use timer override. For some broken Nvidia NF5 boards |
@@ -1032,7 +1035,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1032 | No delay | 1035 | No delay |
1033 | 1036 | ||
1034 | ip= [IP_PNP] | 1037 | ip= [IP_PNP] |
1035 | See Documentation/filesystems/nfsroot.txt. | 1038 | See Documentation/filesystems/nfs/nfsroot.txt. |
1036 | 1039 | ||
1037 | ip2= [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards | 1040 | ip2= [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards |
1038 | See comment before ip2_setup() in | 1041 | See comment before ip2_setup() in |
@@ -1553,10 +1556,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1553 | going to be removed in 2.6.29. | 1556 | going to be removed in 2.6.29. |
1554 | 1557 | ||
1555 | nfsaddrs= [NFS] | 1558 | nfsaddrs= [NFS] |
1556 | See Documentation/filesystems/nfsroot.txt. | 1559 | See Documentation/filesystems/nfs/nfsroot.txt. |
1557 | 1560 | ||
1558 | nfsroot= [NFS] nfs root filesystem for disk-less boxes. | 1561 | nfsroot= [NFS] nfs root filesystem for disk-less boxes. |
1559 | See Documentation/filesystems/nfsroot.txt. | 1562 | See Documentation/filesystems/nfs/nfsroot.txt. |
1560 | 1563 | ||
1561 | nfs.callback_tcpport= | 1564 | nfs.callback_tcpport= |
1562 | [NFS] set the TCP port on which the NFSv4 callback | 1565 | [NFS] set the TCP port on which the NFSv4 callback |
@@ -2729,6 +2732,11 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2729 | vmpoff= [KNL,S390] Perform z/VM CP command after power off. | 2732 | vmpoff= [KNL,S390] Perform z/VM CP command after power off. |
2730 | Format: <command> | 2733 | Format: <command> |
2731 | 2734 | ||
2735 | vt.cur_default= [VT] Default cursor shape. | ||
2736 | Format: 0xCCBBAA, where AA, BB, and CC are the same as | ||
2737 | the parameters of the <Esc>[?A;B;Cc escape sequence; | ||
2738 | see VGA-softcursor.txt. Default: 2 = underline. | ||
2739 | |||
2732 | vt.default_blu= [VT] | 2740 | vt.default_blu= [VT] |
2733 | Format: <blue0>,<blue1>,<blue2>,...,<blue15> | 2741 | Format: <blue0>,<blue1>,<blue2>,...,<blue15> |
2734 | Change the default blue palette of the console. | 2742 | Change the default blue palette of the console. |