diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
commit | ea88023b3491a384575ebcd5e8a449e841a28a24 (patch) | |
tree | f46e3d8302e44dc55ce31823501e100472d29683 /Documentation/kernel-parameters.txt | |
parent | a6f15ade97989d414e9bf33874c9d5d1f39808ec (diff) | |
parent | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/vmlinux.lds.S
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 89 |
1 files changed, 84 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 76c355214dc3..574ee67b6181 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -57,6 +57,7 @@ parameter is applicable: | |||
57 | ISAPNP ISA PnP code is enabled. | 57 | ISAPNP ISA PnP code is enabled. |
58 | ISDN Appropriate ISDN support is enabled. | 58 | ISDN Appropriate ISDN support is enabled. |
59 | JOY Appropriate joystick support is enabled. | 59 | JOY Appropriate joystick support is enabled. |
60 | KVM Kernel Virtual Machine support is enabled. | ||
60 | LIBATA Libata driver is enabled | 61 | LIBATA Libata driver is enabled |
61 | LP Printer support is enabled. | 62 | LP Printer support is enabled. |
62 | LOOP Loopback device support is enabled. | 63 | LOOP Loopback device support is enabled. |
@@ -1098,6 +1099,44 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1098 | kstack=N [X86] Print N words from the kernel stack | 1099 | kstack=N [X86] Print N words from the kernel stack |
1099 | in oops dumps. | 1100 | in oops dumps. |
1100 | 1101 | ||
1102 | kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs. | ||
1103 | Default is 0 (don't ignore, but inject #GP) | ||
1104 | |||
1105 | kvm.oos_shadow= [KVM] Disable out-of-sync shadow paging. | ||
1106 | Default is 1 (enabled) | ||
1107 | |||
1108 | kvm-amd.nested= [KVM,AMD] Allow nested virtualization in KVM/SVM. | ||
1109 | Default is 0 (off) | ||
1110 | |||
1111 | kvm-amd.npt= [KVM,AMD] Disable nested paging (virtualized MMU) | ||
1112 | for all guests. | ||
1113 | Default is 1 (enabled) if in 64bit or 32bit-PAE mode | ||
1114 | |||
1115 | kvm-intel.bypass_guest_pf= | ||
1116 | [KVM,Intel] Disables bypassing of guest page faults | ||
1117 | on Intel chips. Default is 1 (enabled) | ||
1118 | |||
1119 | kvm-intel.ept= [KVM,Intel] Disable extended page tables | ||
1120 | (virtualized MMU) support on capable Intel chips. | ||
1121 | Default is 1 (enabled) | ||
1122 | |||
1123 | kvm-intel.emulate_invalid_guest_state= | ||
1124 | [KVM,Intel] Enable emulation of invalid guest states | ||
1125 | Default is 0 (disabled) | ||
1126 | |||
1127 | kvm-intel.flexpriority= | ||
1128 | [KVM,Intel] Disable FlexPriority feature (TPR shadow). | ||
1129 | Default is 1 (enabled) | ||
1130 | |||
1131 | kvm-intel.unrestricted_guest= | ||
1132 | [KVM,Intel] Disable unrestricted guest feature | ||
1133 | (virtualized real and unpaged mode) on capable | ||
1134 | Intel chips. Default is 1 (enabled) | ||
1135 | |||
1136 | kvm-intel.vpid= [KVM,Intel] Disable Virtual Processor Identification | ||
1137 | feature (tagged TLBs) on capable Intel chips. | ||
1138 | Default is 1 (enabled) | ||
1139 | |||
1101 | l2cr= [PPC] | 1140 | l2cr= [PPC] |
1102 | 1141 | ||
1103 | l3cr= [PPC] | 1142 | l3cr= [PPC] |
@@ -1503,6 +1542,14 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1503 | [NFS] set the TCP port on which the NFSv4 callback | 1542 | [NFS] set the TCP port on which the NFSv4 callback |
1504 | channel should listen. | 1543 | channel should listen. |
1505 | 1544 | ||
1545 | nfs.cache_getent= | ||
1546 | [NFS] sets the pathname to the program which is used | ||
1547 | to update the NFS client cache entries. | ||
1548 | |||
1549 | nfs.cache_getent_timeout= | ||
1550 | [NFS] sets the timeout after which an attempt to | ||
1551 | update a cache entry is deemed to have failed. | ||
1552 | |||
1506 | nfs.idmap_cache_timeout= | 1553 | nfs.idmap_cache_timeout= |
1507 | [NFS] set the maximum lifetime for idmapper cache | 1554 | [NFS] set the maximum lifetime for idmapper cache |
1508 | entries. | 1555 | entries. |
@@ -1535,6 +1582,11 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1535 | symbolic names: lapic and ioapic | 1582 | symbolic names: lapic and ioapic |
1536 | Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic | 1583 | Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic |
1537 | 1584 | ||
1585 | netpoll.carrier_timeout= | ||
1586 | [NET] Specifies amount of time (in seconds) that | ||
1587 | netpoll should wait for a carrier. By default netpoll | ||
1588 | waits 4 seconds. | ||
1589 | |||
1538 | no387 [BUGS=X86-32] Tells the kernel to use the 387 maths | 1590 | no387 [BUGS=X86-32] Tells the kernel to use the 387 maths |
1539 | emulation library even if a 387 maths coprocessor | 1591 | emulation library even if a 387 maths coprocessor |
1540 | is present. | 1592 | is present. |
@@ -1919,11 +1971,12 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1919 | Format: { 0 | 1 } | 1971 | Format: { 0 | 1 } |
1920 | See arch/parisc/kernel/pdc_chassis.c | 1972 | See arch/parisc/kernel/pdc_chassis.c |
1921 | 1973 | ||
1922 | percpu_alloc= [X86] Select which percpu first chunk allocator to use. | 1974 | percpu_alloc= Select which percpu first chunk allocator to use. |
1923 | Allowed values are one of "lpage", "embed" and "4k". | 1975 | Currently supported values are "embed" and "page". |
1924 | See comments in arch/x86/kernel/setup_percpu.c for | 1976 | Archs may support subset or none of the selections. |
1925 | details on each allocator. This parameter is primarily | 1977 | See comments in mm/percpu.c for details on each |
1926 | for debugging and performance comparison. | 1978 | allocator. This parameter is primarily for debugging |
1979 | and performance comparison. | ||
1927 | 1980 | ||
1928 | pf. [PARIDE] | 1981 | pf. [PARIDE] |
1929 | See Documentation/blockdev/paride.txt. | 1982 | See Documentation/blockdev/paride.txt. |
@@ -2395,6 +2448,18 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2395 | stifb= [HW] | 2448 | stifb= [HW] |
2396 | Format: bpp:<bpp1>[:<bpp2>[:<bpp3>...]] | 2449 | Format: bpp:<bpp1>[:<bpp2>[:<bpp3>...]] |
2397 | 2450 | ||
2451 | sunrpc.min_resvport= | ||
2452 | sunrpc.max_resvport= | ||
2453 | [NFS,SUNRPC] | ||
2454 | SunRPC servers often require that client requests | ||
2455 | originate from a privileged port (i.e. a port in the | ||
2456 | range 0 < portnr < 1024). | ||
2457 | An administrator who wishes to reserve some of these | ||
2458 | ports for other uses may adjust the range that the | ||
2459 | kernel's sunrpc client considers to be privileged | ||
2460 | using these two parameters to set the minimum and | ||
2461 | maximum port values. | ||
2462 | |||
2398 | sunrpc.pool_mode= | 2463 | sunrpc.pool_mode= |
2399 | [NFS] | 2464 | [NFS] |
2400 | Control how the NFS server code allocates CPUs to | 2465 | Control how the NFS server code allocates CPUs to |
@@ -2411,6 +2476,15 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2411 | pernode one pool for each NUMA node (equivalent | 2476 | pernode one pool for each NUMA node (equivalent |
2412 | to global on non-NUMA machines) | 2477 | to global on non-NUMA machines) |
2413 | 2478 | ||
2479 | sunrpc.tcp_slot_table_entries= | ||
2480 | sunrpc.udp_slot_table_entries= | ||
2481 | [NFS,SUNRPC] | ||
2482 | Sets the upper limit on the number of simultaneous | ||
2483 | RPC calls that can be sent from the client to a | ||
2484 | server. Increasing these values may allow you to | ||
2485 | improve throughput, but will also increase the | ||
2486 | amount of memory reserved for use by the client. | ||
2487 | |||
2414 | swiotlb= [IA-64] Number of I/O TLB slabs | 2488 | swiotlb= [IA-64] Number of I/O TLB slabs |
2415 | 2489 | ||
2416 | switches= [HW,M68k] | 2490 | switches= [HW,M68k] |
@@ -2480,6 +2554,11 @@ and is between 256 and 4096 characters. It is defined in the file | |||
2480 | trace_buf_size=nn[KMG] | 2554 | trace_buf_size=nn[KMG] |
2481 | [FTRACE] will set tracing buffer size. | 2555 | [FTRACE] will set tracing buffer size. |
2482 | 2556 | ||
2557 | trace_event=[event-list] | ||
2558 | [FTRACE] Set and start specified trace events in order | ||
2559 | to facilitate early boot debugging. | ||
2560 | See also Documentation/trace/events.txt | ||
2561 | |||
2483 | trix= [HW,OSS] MediaTrix AudioTrix Pro | 2562 | trix= [HW,OSS] MediaTrix AudioTrix Pro |
2484 | Format: | 2563 | Format: |
2485 | <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq> | 2564 | <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq> |