git.samba.org / sfrench / cifs-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
x86: memtest bootparam
[sfrench/cifs-2.6.git] / Documentation / kernel-parameters.txt
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 9a5b6658c65e0ee4a6b55df39da68d5836e9889b..f9ea0803d5d65fd736863a505839e8e1d6a4704c 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -138,7 +138,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        strict -- Be less tolerant of platforms that are not
                                strictly ACPI specification compliant.
 
-                       See also Documentation/pm.txt, pci=noacpi
+                       See also Documentation/power/pm.txt, pci=noacpi
 
        acpi_apic_instance=     [ACPI, IOAPIC]
                        Format: <int>
@@ -170,16 +170,8 @@ and is between 256 and 4096 characters. It is defined in the file
        acpi_irq_isa=   [HW,ACPI] If irq_balance, mark listed IRQs used by ISA
                        Format: <irq>,<irq>...
 
-       acpi_new_pts_ordering [HW,ACPI]
-                       Enforce the ACPI 2.0 ordering of the _PTS control
-                       method wrt putting devices into low power states
-                       default: pre ACPI 2.0 ordering of _PTS
-
        acpi_no_auto_ssdt       [HW,ACPI] Disable automatic loading of SSDT
 
-       acpi_no_initrd_override [KNL,ACPI]
-                       Disable loading custom ACPI tables from the initramfs
-
        acpi_os_name=   [HW,ACPI] Tell ACPI BIOS the name of the OS
                        Format: To spoof as Windows 98: ="Microsoft Windows"
 
@@ -383,6 +375,10 @@ and is between 256 and 4096 characters. It is defined in the file
        ccw_timeout_log [S390]
                        See Documentation/s390/CommonIO for details.
 
+       cgroup_disable= [KNL] Disable a particular controller
+                       Format: {name of the controller(s) to disable}
+                               {Currently supported controllers - "memory"}
+
        checkreqprot    [SELINUX] Set initial checkreqprot flag value.
                        Format: { "0" | "1" }
                        See security/selinux/Kconfig help text.
@@ -712,7 +708,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format: <cyl>,<head>,<sect>
 
        hd?=            [HW] (E)IDE subsystem
-       hd?lun=         See Documentation/ide.txt.
+       hd?lun=         See Documentation/ide/ide.txt.
 
        highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact
                        size of <nn>. This works even on boxes that have no
@@ -735,6 +731,8 @@ and is between 256 and 4096 characters. It is defined in the file
                             (Don't attempt to blink the leds)
        i8042.noaux     [HW] Don't check for auxiliary (== mouse) port
        i8042.nokbd     [HW] Don't check/create keyboard port
+       i8042.noloop    [HW] Disable the AUX Loopback command while probing
+                            for the AUX port
        i8042.nomux     [HW] Don't check presence of an active multiplexing
                             controller
        i8042.nopnp     [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
@@ -766,14 +764,14 @@ and is between 256 and 4096 characters. It is defined in the file
 
        ide=            [HW] (E)IDE subsystem
                        Format: ide=nodma or ide=doubler or ide=reverse
-                       See Documentation/ide.txt.
+                       See Documentation/ide/ide.txt.
 
        ide?=           [HW] (E)IDE subsystem
                        Format: ide?=noprobe or chipset specific parameters.
-                       See Documentation/ide.txt.
+                       See Documentation/ide/ide.txt.
 
        idebus=         [HW] (E)IDE subsystem - VLB/PCI bus speed
-                       See Documentation/ide.txt.
+                       See Documentation/ide/ide.txt.
 
        idle=           [X86]
                        Format: idle=poll or idle=mwait
@@ -814,6 +812,19 @@ and is between 256 and 4096 characters. It is defined in the file
 
        inttest=        [IA64]
 
+       iommu=          [x86]
+               off
+               force
+               noforce
+               biomerge
+               panic
+               nopanic
+               merge
+               nomerge
+               forcesac
+               soft
+
+
        intel_iommu=    [DMAR] Intel IOMMU driver (DMAR) option
                off
                        Disable intel iommu driver.
@@ -846,7 +857,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        arch/alpha/kernel/core_marvel.c.
 
        ip=             [IP_PNP]
-                       See Documentation/nfsroot.txt.
+                       See Documentation/filesystems/nfsroot.txt.
 
        ip2=            [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards
                        See comment before ip2_setup() in
@@ -1131,6 +1142,15 @@ and is between 256 and 4096 characters. It is defined in the file
        memmap=nn[KMG]$ss[KMG]
                        [KNL,ACPI] Mark specific memory as reserved.
                        Region of memory to be used, from ss to ss+nn.
+                       Example: Exclude memory from 0x18690000-0x1869ffff
+                                memmap=64K$0x18690000
+                                or
+                                memmap=0x10000$0x18690000
+
+       memtest=        [KNL,X86_64] Enable memtest
+                       Format: <integer>
+                       range: 0,4 : pattern number
+                       default : 0 <disable>
 
        meye.*=         [HW] Set MotionEye Camera parameters
                        See Documentation/video4linux/meye.txt.
@@ -1196,10 +1216,10 @@ and is between 256 and 4096 characters. It is defined in the file
                        file if at all.
 
        nfsaddrs=       [NFS]
-                       See Documentation/nfsroot.txt.
+                       See Documentation/filesystems/nfsroot.txt.
 
        nfsroot=        [NFS] nfs root filesystem for disk-less boxes.
-                       See Documentation/nfsroot.txt.
+                       See Documentation/filesystems/nfsroot.txt.
 
        nfs.callback_tcpport=
                        [NFS] set the TCP port on which the NFSv4 callback
Unnamed repository; edit this file 'description' to name the repository.