Commit 16290246 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

Documentation: kernel-parameters.txt cleanups

General cleanups to kernel-parameters.txt:
 - add missing $ARCH that are being used/referenced
 - alphabetize the parameter restrictions list
 - spell "IA-64" as listed in arch/ia64/Kconfig instead of "IA64"
 - remove trailing whitespace
 - use hyphen in 32-bit etc.
Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ac1667db
...@@ -40,6 +40,7 @@ parameter is applicable: ...@@ -40,6 +40,7 @@ parameter is applicable:
ALSA ALSA sound support is enabled. ALSA ALSA sound support is enabled.
APIC APIC support is enabled. APIC APIC support is enabled.
APM Advanced Power Management support is enabled. APM Advanced Power Management support is enabled.
ARM ARM architecture is enabled.
AVR32 AVR32 architecture is enabled. AVR32 AVR32 architecture is enabled.
AX25 Appropriate AX.25 support is enabled. AX25 Appropriate AX.25 support is enabled.
BLACKFIN Blackfin architecture is enabled. BLACKFIN Blackfin architecture is enabled.
...@@ -49,6 +50,7 @@ parameter is applicable: ...@@ -49,6 +50,7 @@ parameter is applicable:
EFI EFI Partitioning (GPT) is enabled EFI EFI Partitioning (GPT) is enabled
EIDE EIDE/ATAPI support is enabled. EIDE EIDE/ATAPI support is enabled.
FB The frame buffer device is enabled. FB The frame buffer device is enabled.
FTRACE Function tracing enabled.
GCOV GCOV profiling is enabled. GCOV GCOV profiling is enabled.
HW Appropriate hardware is enabled. HW Appropriate hardware is enabled.
IA-64 IA-64 architecture is enabled. IA-64 IA-64 architecture is enabled.
...@@ -69,6 +71,7 @@ parameter is applicable: ...@@ -69,6 +71,7 @@ parameter is applicable:
Documentation/m68k/kernel-options.txt. Documentation/m68k/kernel-options.txt.
MCA MCA bus support is enabled. MCA MCA bus support is enabled.
MDA MDA console support is enabled. MDA MDA console support is enabled.
MIPS MIPS architecture is enabled.
MOUSE Appropriate mouse support is enabled. MOUSE Appropriate mouse support is enabled.
MSI Message Signaled Interrupts (PCI). MSI Message Signaled Interrupts (PCI).
MTD MTD (Memory Technology Device) support is enabled. MTD MTD (Memory Technology Device) support is enabled.
...@@ -100,7 +103,6 @@ parameter is applicable: ...@@ -100,7 +103,6 @@ parameter is applicable:
SPARC Sparc architecture is enabled. SPARC Sparc architecture is enabled.
SWSUSP Software suspend (hibernation) is enabled. SWSUSP Software suspend (hibernation) is enabled.
SUSPEND System suspend states are enabled. SUSPEND System suspend states are enabled.
FTRACE Function tracing enabled.
TPM TPM drivers are enabled. TPM TPM drivers are enabled.
TS Appropriate touchscreen support is enabled. TS Appropriate touchscreen support is enabled.
UMS USB Mass Storage support is enabled. UMS USB Mass Storage support is enabled.
...@@ -115,7 +117,7 @@ parameter is applicable: ...@@ -115,7 +117,7 @@ parameter is applicable:
X86-64 X86-64 architecture is enabled. X86-64 X86-64 architecture is enabled.
More X86-64 boot options can be found in More X86-64 boot options can be found in
Documentation/x86/x86_64/boot-options.txt . Documentation/x86/x86_64/boot-options.txt .
X86 Either 32bit or 64bit x86 (same as X86-32+X86-64) X86 Either 32-bit or 64-bit x86 (same as X86-32+X86-64)
XEN Xen support is enabled XEN Xen support is enabled
In addition, the following text indicates that the option: In addition, the following text indicates that the option:
...@@ -376,7 +378,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -376,7 +378,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
atkbd.softrepeat= [HW] atkbd.softrepeat= [HW]
Use software keyboard repeat Use software keyboard repeat
autotest [IA64] autotest [IA-64]
baycom_epp= [HW,AX25] baycom_epp= [HW,AX25]
Format: <io>,<mode> Format: <io>,<mode>
...@@ -681,8 +683,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -681,8 +683,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
uart[8250],mmio32,<addr>[,options] uart[8250],mmio32,<addr>[,options]
Start an early, polled-mode console on the 8250/16550 Start an early, polled-mode console on the 8250/16550
UART at the specified I/O port or MMIO address. UART at the specified I/O port or MMIO address.
MMIO inter-register address stride is either 8bit (mmio) MMIO inter-register address stride is either 8-bit
or 32bit (mmio32). (mmio) or 32-bit (mmio32).
The options are the same as for ttyS, above. The options are the same as for ttyS, above.
earlyprintk= [X86,SH,BLACKFIN] earlyprintk= [X86,SH,BLACKFIN]
...@@ -725,7 +727,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -725,7 +727,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
See Documentation/block/as-iosched.txt and See Documentation/block/as-iosched.txt and
Documentation/block/deadline-iosched.txt for details. Documentation/block/deadline-iosched.txt for details.
elfcorehdr= [IA64,PPC,SH,X86] elfcorehdr= [IA-64,PPC,SH,X86]
Specifies physical address of start of kernel core Specifies physical address of start of kernel core
image elf header. Generally kexec loader will image elf header. Generally kexec loader will
pass this option to capture kernel. pass this option to capture kernel.
...@@ -791,7 +793,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -791,7 +793,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
tracer at boot up. function-list is a comma separated tracer at boot up. function-list is a comma separated
list of functions. This list can be changed at run list of functions. This list can be changed at run
time by the set_ftrace_filter file in the debugfs time by the set_ftrace_filter file in the debugfs
tracing directory. tracing directory.
ftrace_notrace=[function-list] ftrace_notrace=[function-list]
[FTRACE] Do not trace the functions specified in [FTRACE] Do not trace the functions specified in
...@@ -829,7 +831,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -829,7 +831,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
hashdist= [KNL,NUMA] Large hashes allocated during boot hashdist= [KNL,NUMA] Large hashes allocated during boot
are distributed across NUMA nodes. Defaults on are distributed across NUMA nodes. Defaults on
for 64bit NUMA, off otherwise. for 64-bit NUMA, off otherwise.
Format: 0 | 1 (for off | on) Format: 0 | 1 (for off | on)
hcl= [IA-64] SGI's Hardware Graph compatibility layer hcl= [IA-64] SGI's Hardware Graph compatibility layer
...@@ -998,10 +1000,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -998,10 +1000,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
DMA. DMA.
forcedac [x86_64] forcedac [x86_64]
With this option iommu will not optimize to look With this option iommu will not optimize to look
for io virtual address below 32 bit forcing dual for io virtual address below 32-bit forcing dual
address cycle on pci bus for cards supporting greater address cycle on pci bus for cards supporting greater
than 32 bit addressing. The default is to look than 32-bit addressing. The default is to look
for translation below 32 bit and if not available for translation below 32-bit and if not available
then look in the higher range. then look in the higher range.
strict [Default Off] strict [Default Off]
With this option on every unmap_single operation will With this option on every unmap_single operation will
...@@ -1017,7 +1019,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -1017,7 +1019,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
off disable Interrupt Remapping off disable Interrupt Remapping
nosid disable Source ID checking nosid disable Source ID checking
inttest= [IA64] inttest= [IA-64]
iomem= Disable strict checking of access to MMIO memory iomem= Disable strict checking of access to MMIO memory
strict regions from userspace. strict regions from userspace.
...@@ -1034,7 +1036,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -1034,7 +1036,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
nomerge nomerge
forcesac forcesac
soft soft
pt [x86, IA64] pt [x86, IA-64]
io7= [HW] IO7 for Marvel based alpha systems io7= [HW] IO7 for Marvel based alpha systems
See comment before marvel_specify_io7 in See comment before marvel_specify_io7 in
...@@ -1165,7 +1167,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -1165,7 +1167,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
kvm-amd.npt= [KVM,AMD] Disable nested paging (virtualized MMU) kvm-amd.npt= [KVM,AMD] Disable nested paging (virtualized MMU)
for all guests. for all guests.
Default is 1 (enabled) if in 64bit or 32bit-PAE mode Default is 1 (enabled) if in 64-bit or 32-bit PAE mode.
kvm-intel.ept= [KVM,Intel] Disable extended page tables kvm-intel.ept= [KVM,Intel] Disable extended page tables
(virtualized MMU) support on capable Intel chips. (virtualized MMU) support on capable Intel chips.
...@@ -1202,10 +1204,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -1202,10 +1204,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
libata.dma=0 Disable all PATA and SATA DMA libata.dma=0 Disable all PATA and SATA DMA
libata.dma=1 PATA and SATA Disk DMA only libata.dma=1 PATA and SATA Disk DMA only
libata.dma=2 ATAPI (CDROM) DMA only libata.dma=2 ATAPI (CDROM) DMA only
libata.dma=4 Compact Flash DMA only libata.dma=4 Compact Flash DMA only
Combinations also work, so libata.dma=3 enables DMA Combinations also work, so libata.dma=3 enables DMA
for disks and CDROMs, but not CFs. for disks and CDROMs, but not CFs.
libata.ignore_hpa= [LIBATA] Ignore HPA limit libata.ignore_hpa= [LIBATA] Ignore HPA limit
libata.ignore_hpa=0 keep BIOS limits (default) libata.ignore_hpa=0 keep BIOS limits (default)
libata.ignore_hpa=1 ignore limits, using full disk libata.ignore_hpa=1 ignore limits, using full disk
...@@ -1331,7 +1333,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -1331,7 +1333,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
ltpc= [NET] ltpc= [NET]
Format: <io>,<irq>,<dma> Format: <io>,<irq>,<dma>
machvec= [IA64] Force the use of a particular machine-vector machvec= [IA-64] Force the use of a particular machine-vector
(machvec) in a generic kernel. (machvec) in a generic kernel.
Example: machvec=hpzx1_swiotlb Example: machvec=hpzx1_swiotlb
...@@ -1734,7 +1736,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -1734,7 +1736,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
nointroute [IA-64] nointroute [IA-64]
nojitter [IA64] Disables jitter checking for ITC timers. nojitter [IA-64] Disables jitter checking for ITC timers.
no-kvmclock [X86,KVM] Disable paravirtualized KVM clock driver no-kvmclock [X86,KVM] Disable paravirtualized KVM clock driver
...@@ -1800,7 +1802,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -1800,7 +1802,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
nox2apic [X86-64,APIC] Do not enable x2APIC mode. nox2apic [X86-64,APIC] Do not enable x2APIC mode.
nptcg= [IA64] Override max number of concurrent global TLB nptcg= [IA-64] Override max number of concurrent global TLB
purges which is reported from either PAL_VM_SUMMARY or purges which is reported from either PAL_VM_SUMMARY or
SAL PALO. SAL PALO.
...@@ -2077,7 +2079,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -2077,7 +2079,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
Format: { parport<nr> | timid | 0 } Format: { parport<nr> | timid | 0 }
See also Documentation/parport.txt. See also Documentation/parport.txt.
pmtmr= [X86] Manual setup of pmtmr I/O Port. pmtmr= [X86] Manual setup of pmtmr I/O Port.
Override pmtimer IOPort with a hex value. Override pmtimer IOPort with a hex value.
e.g. pmtmr=0x508 e.g. pmtmr=0x508
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment