Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[linux-2.6-microblaze.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 0940078..f085a61 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -515,7 +515,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        cgroup_disable= [KNL] Disable a particular controller
                        Format: {name of the controller(s) to disable}
-                               {Currently supported controllers - "memory"}
+                       The effects of cgroup_disable=foo are:
+                       - foo isn't auto-mounted if you mount all cgroups in
+                         a single hierarchy
+                       - foo isn't visible as an individually mountable
+                         subsystem
+                       {Currently only "memory" controller deal with this and
+                       cut the overhead, others just disable the usage. So
+                       only cgroup_disable=memory is actually worthy}
 
        checkreqprot    [SELINUX] Set initial checkreqprot flag value.
                        Format: { "0" | "1" }
@@ -774,6 +781,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        disable=        [IPV6]
                        See Documentation/networking/ipv6.txt.
 
+       disable_cpu_apicid= [X86,APIC,SMP]
+                       Format: <int>
+                       The number of initial APIC ID for the
+                       corresponding CPU to be disabled at boot,
+                       mostly used for the kdump 2nd kernel to
+                       disable BSP to wake up multiple CPUs without
+                       causing system reset or hang due to sending
+                       INIT from AP to BSP.
+
        disable_ddw     [PPC/PSERIES]
                        Disable Dynamic DMA Window support. Use this if
                        to workaround buggy firmware.
@@ -881,6 +897,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
                        The xen output can only be used by Xen PV guests.
 
+       edac_report=    [HW,EDAC] Control how to report EDAC event
+                       Format: {"on" | "off" | "force"}
+                       on: enable EDAC to report H/W event. May be overridden
+                       by other higher priority error reporting module.
+                       off: disable H/W event reporting through EDAC.
+                       force: enforce the use of EDAC to report H/W event.
+                       default: on.
+
        ekgdboc=        [X86,KGDB] Allow early kernel console debugging
                        ekgdboc=kbd
 
@@ -890,6 +914,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        edd=            [EDD]
                        Format: {"off" | "on" | "skip[mbr]"}
 
+       efi=            [EFI]
+                       Format: { "old_map" }
+                       old_map [X86-64]: switch to the old ioremap-based EFI
+                       runtime services mapping. 32-bit still uses this one by
+                       default.
+
        efi_no_storage_paranoia [EFI; X86]
                        Using this parameter you can use more than 50% of
                        your efi variable storage. Use this parameter only if
@@ -1994,6 +2024,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        noapic          [SMP,APIC] Tells the kernel to not make use of any
                        IOAPICs that may be present in the system.
 
+       nokaslr         [X86]
+                       Disable kernel base offset ASLR (Address Space
+                       Layout Randomization) if built into the kernel.
+
        noautogroup     Disable scheduler automatic task group creation.
 
        nobats          [PPC] Do not use BATs for mapping kernel lowmem